File tree Expand file tree Collapse file tree 8 files changed +3
-24
lines changed Expand file tree Collapse file tree 8 files changed +3
-24
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ rust_library(
17
17
],
18
18
target_compatible_with = [
19
19
"//constraints:library" ,
20
- "//constraints:sysroot-deps=explicit " ,
20
+ "//constraints:build-script=false " ,
21
21
],
22
22
visibility = ["PUBLIC" ],
23
23
deps = [
Original file line number Diff line number Diff line change 1
1
load (":defs.bzl" , "constraint" )
2
2
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
-
15
3
constraint (
16
4
setting = "workspace" ,
17
5
values = [
Original file line number Diff line number Diff line change @@ -153,12 +153,11 @@ def _target_constraints(crate_root):
153
153
if crate_root and crate_root .startswith ("rust/library/" ):
154
154
target_compatible_with = [
155
155
"//constraints:library" ,
156
- "//constraints:sysroot-deps=explicit " ,
156
+ "//constraints:build-script=false " ,
157
157
]
158
158
elif crate_root and (crate_root .startswith ("rust/compiler/" ) or crate_root .startswith ("rust/src/" )):
159
159
target_compatible_with = [
160
160
"//constraints:compiler" ,
161
- "//constraints:sysroot-deps=implicit" ,
162
161
]
163
162
else :
164
163
target_compatible_with = select ({
Original file line number Diff line number Diff line change @@ -68,7 +68,6 @@ platform = rule(
68
68
"//constraints:bootstrap-stage" ,
69
69
"//constraints:build-script" ,
70
70
"//constraints:opt-level" ,
71
- "//constraints:sysroot-deps" ,
72
71
"//constraints:workspace" ,
73
72
]),
74
73
},
Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ platform(
8
8
"//constraints:library" ,
9
9
"//constraints:opt-level=3" ,
10
10
"//constraints:stage1" ,
11
- "//constraints:sysroot-deps=explicit" ,
12
11
],
13
12
visibility = ["PUBLIC" ],
14
13
)
@@ -19,7 +18,6 @@ platform(
19
18
constraint_values = [
20
19
"//constraints:build-script=true" ,
21
20
"//constraints:opt-level=0" ,
22
- "//constraints:sysroot-deps=implicit" ,
23
21
],
24
22
visibility = ["PUBLIC" ],
25
23
)
@@ -32,7 +30,6 @@ platform(
32
30
"//constraints:compiler" ,
33
31
"//constraints:opt-level=3" ,
34
32
"//constraints:stage1" ,
35
- "//constraints:sysroot-deps=implicit" ,
36
33
],
37
34
visibility = ["PUBLIC" ],
38
35
)
Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ platform(
8
8
"//constraints:library" ,
9
9
"//constraints:opt-level=3" ,
10
10
"//constraints:stage2" ,
11
- "//constraints:sysroot-deps=explicit" ,
12
11
],
13
12
visibility = ["PUBLIC" ],
14
13
)
@@ -19,7 +18,6 @@ platform(
19
18
constraint_values = [
20
19
"//constraints:build-script=true" ,
21
20
"//constraints:opt-level=0" ,
22
- "//constraints:sysroot-deps=implicit" ,
23
21
],
24
22
visibility = ["PUBLIC" ],
25
23
)
@@ -32,7 +30,6 @@ platform(
32
30
"//constraints:compiler" ,
33
31
"//constraints:opt-level=3" ,
34
32
"//constraints:stage2" ,
35
- "//constraints:sysroot-deps=implicit" ,
36
33
],
37
34
visibility = ["PUBLIC" ],
38
35
)
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ rust_toolchain(
45
45
}),
46
46
exec_compatible_with = [
47
47
"rust//constraints:opt-level=0" ,
48
- "rust//constraints:sysroot-deps=implicit " ,
48
+ "rust//constraints:build-script=true " ,
49
49
] + select ({
50
50
"rust//constraints:compiler" : ["rust//constraints:compiler" ],
51
51
"rust//constraints:library" : ["rust//constraints:library" ],
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ configuration_transition(
6
6
discard_settings = [
7
7
"rust//constraints:bootstrap-stage" ,
8
8
"rust//constraints:build-script" ,
9
- "rust//constraints:sysroot-deps" ,
10
9
"rust//constraints:workspace" ,
11
10
],
12
11
label = "cxx" ,
You can’t perform that action at this time.
0 commit comments