update patch

bazelbuild · Sep 11, 2024 · 4b381c2 · 4b381c2
1 parent 6d03c32
commit 4b381c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl
@@ -1068,7 +1068,7 @@ def construct_arguments(
         ))
 
     # Ensure the sysroot is set for the target platform
-    if toolchain._experimental_toolchain_generated_sysroot:
+    if toolchain._toolchain_generated_sysroot:
         rustc_flags.add(toolchain.sysroot, format = "--sysroot=%s")
 
     if toolchain._rename_first_party_crates:

diff --git a/rust/toolchain.bzl b/rust/toolchain.bzl
@@ -871,13 +871,6 @@ rust_toolchain = rule(
         "_cc_toolchain": attr.label(
             default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
         ),
-        "_toolchain_generated_sysroot": attr.label(
-            default = Label("//rust/settings:toolchain_generated_sysroot"),
-            doc = (
-                "Label to a boolean build setting that lets the rule knows wheter to set --sysroot to rustc. " +
-                "This flag is only relevant when used together with --@rules_rust//rust/settings:toolchain_generated_sysroot."
-            ),
-        ),
         "_experimental_use_coverage_metadata_files": attr.label(
             default = Label("//rust/settings:experimental_use_coverage_metadata_files"),
         ),
@@ -900,6 +893,13 @@ rust_toolchain = rule(
         "_third_party_dir": attr.label(
             default = Label("//rust/settings:third_party_dir"),
         ),
+        "_toolchain_generated_sysroot": attr.label(
+            default = Label("//rust/settings:toolchain_generated_sysroot"),
+            doc = (
+                "Label to a boolean build setting that lets the rule knows wheter to set --sysroot to rustc. " +
+                "This flag is only relevant when used together with --@rules_rust//rust/settings:toolchain_generated_sysroot."
+            ),
+        ),
     },
     toolchains = [
         "@bazel_tools//tools/cpp:toolchain_type",