Merge pull request #16 from dtolnay/buildscript

dtolnay · web-flow · commit 6f2917e18db2 · 2025-08-19T22:09:36.000-07:00
Delete `sysroot-deps` constraint in favor of `build-script` constraint
diff --git a/allocator/BUCK b/allocator/BUCK
@@ -17,7 +17,7 @@ rust_library(
     ],
     target_compatible_with = [
         "//constraints:library",
-        "//constraints:sysroot-deps=explicit",
+        "//constraints:build-script=false",
     ],
     visibility = ["PUBLIC"],
     deps = [
diff --git a/constraints/BUCK b/constraints/BUCK
@@ -1,17 +1,5 @@
 load(":defs.bzl", "constraint")
 
-constraint(
-    setting = "sysroot-deps",
-    values = [
-        # Crate must declare explicit dependencies on standard library. This is
-        # enabled within standard library code.
-        "sysroot-deps=explicit",
-        # Crate implicitly receives access to standard library crates, such as
-        # within compiler code and standard library build scripts.
-        "sysroot-deps=implicit",
-    ],
-)
-
 constraint(
     setting = "workspace",
     values = [
@@ -32,10 +20,26 @@ constraint(
     ],
 )
 
+constraint(
+    setting = "build-script",
+    values = [
+        "build-script=false",
+        "build-script=true",
+    ],
+)
+
 constraint(
     setting = "opt-level",
     values = [
         "opt-level=0",
         "opt-level=3",
     ],
 )
+
+config_setting(
+    name = "library-build-script",
+    constraint_values = [
+        ":library",
+        ":build-script=true",
+    ],
+)
diff --git a/defs.bzl b/defs.bzl
@@ -153,12 +153,11 @@ def _target_constraints(crate_root):
     if crate_root and crate_root.startswith("rust/library/"):
         target_compatible_with = [
             "//constraints:library",
-            "//constraints:sysroot-deps=explicit",
+            "//constraints:build-script=false",
         ]
     elif crate_root and (crate_root.startswith("rust/compiler/") or crate_root.startswith("rust/src/")):
         target_compatible_with = [
             "//constraints:compiler",
-            "//constraints:sysroot-deps=implicit",
         ]
     else:
         target_compatible_with = select({
diff --git a/platforms/defs.bzl b/platforms/defs.bzl
@@ -66,8 +66,8 @@ platform = rule(
         # this list are preserved.
         "transition": attrs.list(attrs.configuration_label(), default = [
             "//constraints:bootstrap-stage",
+            "//constraints:build-script",
             "//constraints:opt-level",
-            "//constraints:sysroot-deps",
             "//constraints:workspace",
         ]),
     },
diff --git a/platforms/stage1/BUCK b/platforms/stage1/BUCK
@@ -4,10 +4,10 @@ platform(
     name = "library",
     base = "//platforms:host",
     constraint_values = [
+        "//constraints:build-script=false",
         "//constraints:library",
         "//constraints:opt-level=3",
         "//constraints:stage1",
-        "//constraints:sysroot-deps=explicit",
     ],
     visibility = ["PUBLIC"],
 )
@@ -16,8 +16,8 @@ platform(
     name = "library-build-script",
     base = ":library",
     constraint_values = [
+        "//constraints:build-script=true",
         "//constraints:opt-level=0",
-        "//constraints:sysroot-deps=implicit",
     ],
     visibility = ["PUBLIC"],
 )
@@ -26,10 +26,10 @@ platform(
     name = "compiler",
     base = "//platforms:host",
     constraint_values = [
+        "//constraints:build-script=false",
         "//constraints:compiler",
         "//constraints:opt-level=3",
         "//constraints:stage1",
-        "//constraints:sysroot-deps=implicit",
     ],
     visibility = ["PUBLIC"],
 )
@@ -38,6 +38,7 @@ platform(
     name = "compiler-build-script",
     base = ":compiler",
     constraint_values = [
+        "//constraints:build-script=true",
         "//constraints:opt-level=0",
     ],
     visibility = ["PUBLIC"],
diff --git a/platforms/stage2/BUCK b/platforms/stage2/BUCK
@@ -4,10 +4,10 @@ platform(
     name = "library",
     base = "//platforms:host",
     constraint_values = [
+        "//constraints:build-script=false",
         "//constraints:library",
         "//constraints:opt-level=3",
         "//constraints:stage2",
-        "//constraints:sysroot-deps=explicit",
     ],
     visibility = ["PUBLIC"],
 )
@@ -16,8 +16,8 @@ platform(
     name = "library-build-script",
     base = ":library",
     constraint_values = [
+        "//constraints:build-script=true",
         "//constraints:opt-level=0",
-        "//constraints:sysroot-deps=implicit",
     ],
     visibility = ["PUBLIC"],
 )
@@ -26,10 +26,10 @@ platform(
     name = "compiler",
     base = "//platforms:host",
     constraint_values = [
+        "//constraints:build-script=false",
         "//constraints:compiler",
         "//constraints:opt-level=3",
         "//constraints:stage2",
-        "//constraints:sysroot-deps=implicit",
     ],
     visibility = ["PUBLIC"],
 )
@@ -38,6 +38,7 @@ platform(
     name = "compiler-build-script",
     base = ":compiler",
     constraint_values = [
+        "//constraints:build-script=true",
         "//constraints:opt-level=0",
     ],
     visibility = ["PUBLIC"],
diff --git a/toolchains/BUCK b/toolchains/BUCK
@@ -36,16 +36,14 @@ rust_toolchain(
     compiler = select({
         "rust//constraints:stage1": "rust//stage0:rustc",
         "rust//constraints:stage2": select({
-            "rust//constraints:sysroot-deps=explicit": "rust//stage1:rustc",
-            "rust//constraints:sysroot-deps=implicit": select({
-                "rust//constraints:library": "rust//stage0:rustc",
-                "rust//constraints:compiler": "rust//stage1:rustc",
-            }),
+            "rust//constraints:library": "rust//stage1:rustc",
+            "rust//constraints:library-build-script": "rust//stage0:rustc",
+            "rust//constraints:compiler": "rust//stage1:rustc",
         }),
     }),
     exec_compatible_with = [
         "rust//constraints:opt-level=0",
-        "rust//constraints:sysroot-deps=implicit",
+        "rust//constraints:build-script=true",
     ] + select({
         "rust//constraints:compiler": ["rust//constraints:compiler"],
         "rust//constraints:library": ["rust//constraints:library"],
@@ -71,33 +69,31 @@ rust_toolchain(
         "rust//constraints:stage2": "rust//stage1:rustdoc",
     }),
     sysroot = select({
-        "rust//constraints:sysroot-deps=explicit": None,
-        "rust//constraints:sysroot-deps=implicit": select({
-            "rust//constraints:library": "rust//stage0:sysroot",
-            "rust//constraints:compiler": select({
-                "rust//constraints:stage1": dict(
-                    alloc = "rust//stage1:alloc",
-                    compiler_builtins = "rust//stage1:compiler_builtins",
-                    core = "rust//stage1:core",
-                    panic_abort = "rust//stage1:panic_abort",
-                    panic_unwind = "rust//stage1:panic_unwind",
-                    proc_macro = "rust//stage1:proc_macro",
-                    rust_allocator = "rust//stage1:rust_allocator",
-                    std = "rust//stage1:std",
-                    test = "rust//stage1:test",
-                ),
-                "rust//constraints:stage2": dict(
-                    alloc = "rust//stage2:alloc",
-                    compiler_builtins = "rust//stage2:compiler_builtins",
-                    core = "rust//stage2:core",
-                    panic_abort = "rust//stage2:panic_abort",
-                    panic_unwind = "rust//stage2:panic_unwind",
-                    proc_macro = "rust//stage2:proc_macro",
-                    rust_allocator = "rust//stage2:rust_allocator",
-                    std = "rust//stage2:std",
-                    test = "rust//stage2:test",
-                ),
-            }),
+        "rust//constraints:library": None,
+        "rust//constraints:library-build-script": "rust//stage0:sysroot",
+        "rust//constraints:compiler": select({
+            "rust//constraints:stage1": dict(
+                alloc = "rust//stage1:alloc",
+                compiler_builtins = "rust//stage1:compiler_builtins",
+                core = "rust//stage1:core",
+                panic_abort = "rust//stage1:panic_abort",
+                panic_unwind = "rust//stage1:panic_unwind",
+                proc_macro = "rust//stage1:proc_macro",
+                rust_allocator = "rust//stage1:rust_allocator",
+                std = "rust//stage1:std",
+                test = "rust//stage1:test",
+            ),
+            "rust//constraints:stage2": dict(
+                alloc = "rust//stage2:alloc",
+                compiler_builtins = "rust//stage2:compiler_builtins",
+                core = "rust//stage2:core",
+                panic_abort = "rust//stage2:panic_abort",
+                panic_unwind = "rust//stage2:panic_unwind",
+                proc_macro = "rust//stage2:proc_macro",
+                rust_allocator = "rust//stage2:rust_allocator",
+                std = "rust//stage2:std",
+                test = "rust//stage2:test",
+            ),
         }),
     }),
     visibility = ["PUBLIC"],
diff --git a/toolchains/cxx/BUCK b/toolchains/cxx/BUCK
@@ -5,7 +5,7 @@ configuration_transition(
     name = "prune_cxx_configuration",
     discard_settings = [
         "rust//constraints:bootstrap-stage",
-        "rust//constraints:sysroot-deps",
+        "rust//constraints:build-script",
         "rust//constraints:workspace",
     ],
     label = "cxx",

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({`