Skip to content

Commit f4493f1

Browse files
committed
Delete sysroot-deps constraint
1 parent 86d4cba commit f4493f1

File tree

8 files changed

+3
-24
lines changed

8 files changed

+3
-24
lines changed

allocator/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rust_library(
1717
],
1818
target_compatible_with = [
1919
"//constraints:library",
20-
"//constraints:sysroot-deps=explicit",
20+
"//constraints:build-script=false",
2121
],
2222
visibility = ["PUBLIC"],
2323
deps = [

constraints/BUCK

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
load(":defs.bzl", "constraint")
22

3-
constraint(
4-
setting = "sysroot-deps",
5-
values = [
6-
# Crate must declare explicit dependencies on standard library. This is
7-
# enabled within standard library code.
8-
"sysroot-deps=explicit",
9-
# Crate implicitly receives access to standard library crates, such as
10-
# within compiler code and standard library build scripts.
11-
"sysroot-deps=implicit",
12-
],
13-
)
14-
153
constraint(
164
setting = "workspace",
175
values = [

defs.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,11 @@ def _target_constraints(crate_root):
153153
if crate_root and crate_root.startswith("rust/library/"):
154154
target_compatible_with = [
155155
"//constraints:library",
156-
"//constraints:sysroot-deps=explicit",
156+
"//constraints:build-script=false",
157157
]
158158
elif crate_root and (crate_root.startswith("rust/compiler/") or crate_root.startswith("rust/src/")):
159159
target_compatible_with = [
160160
"//constraints:compiler",
161-
"//constraints:sysroot-deps=implicit",
162161
]
163162
else:
164163
target_compatible_with = select({

platforms/defs.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ platform = rule(
6868
"//constraints:bootstrap-stage",
6969
"//constraints:build-script",
7070
"//constraints:opt-level",
71-
"//constraints:sysroot-deps",
7271
"//constraints:workspace",
7372
]),
7473
},

platforms/stage1/BUCK

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ platform(
88
"//constraints:library",
99
"//constraints:opt-level=3",
1010
"//constraints:stage1",
11-
"//constraints:sysroot-deps=explicit",
1211
],
1312
visibility = ["PUBLIC"],
1413
)
@@ -19,7 +18,6 @@ platform(
1918
constraint_values = [
2019
"//constraints:build-script=true",
2120
"//constraints:opt-level=0",
22-
"//constraints:sysroot-deps=implicit",
2321
],
2422
visibility = ["PUBLIC"],
2523
)
@@ -32,7 +30,6 @@ platform(
3230
"//constraints:compiler",
3331
"//constraints:opt-level=3",
3432
"//constraints:stage1",
35-
"//constraints:sysroot-deps=implicit",
3633
],
3734
visibility = ["PUBLIC"],
3835
)

platforms/stage2/BUCK

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ platform(
88
"//constraints:library",
99
"//constraints:opt-level=3",
1010
"//constraints:stage2",
11-
"//constraints:sysroot-deps=explicit",
1211
],
1312
visibility = ["PUBLIC"],
1413
)
@@ -19,7 +18,6 @@ platform(
1918
constraint_values = [
2019
"//constraints:build-script=true",
2120
"//constraints:opt-level=0",
22-
"//constraints:sysroot-deps=implicit",
2321
],
2422
visibility = ["PUBLIC"],
2523
)
@@ -32,7 +30,6 @@ platform(
3230
"//constraints:compiler",
3331
"//constraints:opt-level=3",
3432
"//constraints:stage2",
35-
"//constraints:sysroot-deps=implicit",
3633
],
3734
visibility = ["PUBLIC"],
3835
)

toolchains/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ rust_toolchain(
4545
}),
4646
exec_compatible_with = [
4747
"rust//constraints:opt-level=0",
48-
"rust//constraints:sysroot-deps=implicit",
48+
"rust//constraints:build-script=true",
4949
] + select({
5050
"rust//constraints:compiler": ["rust//constraints:compiler"],
5151
"rust//constraints:library": ["rust//constraints:library"],

toolchains/cxx/BUCK

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ configuration_transition(
66
discard_settings = [
77
"rust//constraints:bootstrap-stage",
88
"rust//constraints:build-script",
9-
"rust//constraints:sysroot-deps",
109
"rust//constraints:workspace",
1110
],
1211
label = "cxx",

0 commit comments

Comments
 (0)