Delete experimental_toolchain_generated_sysroot

Author: UebelAndre

rust/private/rustc.bzl

@@ -1068,8 +1068,7 @@ def construct_arguments(
         ))
 
     # Ensure the sysroot is set for the target platform
-    if toolchain._experimental_toolchain_generated_sysroot:
-        rustc_flags.add(toolchain.sysroot, format = "--sysroot=%s")
+    rustc_flags.add(toolchain.sysroot, format = "--sysroot=%s")
 
     if toolchain._rename_first_party_crates:
         env["RULES_RUST_THIRD_PARTY_DIR"] = toolchain._third_party_dir

rust/settings/BUILD.bazel

@@ -85,13 +85,6 @@ bool_flag(
     build_setting_default = True,
 )
 
-# A flag to set rustc --sysroot flag to the sysroot generated by rust_toolchain
-incompatible_flag(
-    name = "experimental_toolchain_generated_sysroot",
-    build_setting_default = True,
-    issue = "https://github.com/bazelbuild/rules_rust/issues/2039",
-)
-
 # A flag to control whether to link libstd dynamically.
 bool_flag(
     name = "experimental_link_std_dylib",

rust/toolchain.bzl

@@ -697,7 +697,6 @@ def _rust_toolchain_impl(ctx):
         _experimental_use_cc_common_link = _experimental_use_cc_common_link(ctx),
         _experimental_use_global_allocator = experimental_use_global_allocator,
         _experimental_use_coverage_metadata_files = ctx.attr._experimental_use_coverage_metadata_files[BuildSettingInfo].value,
-        _experimental_toolchain_generated_sysroot = ctx.attr._experimental_toolchain_generated_sysroot[IncompatibleFlagInfo].enabled,
         _no_std = no_std,
     )
     return [
@@ -872,13 +871,6 @@ rust_toolchain = rule(
         "_cc_toolchain": attr.label(
             default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
         ),
-        "_experimental_toolchain_generated_sysroot": attr.label(
-            default = Label("//rust/settings:experimental_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:experimental_toolchain_generated_sysroot."
-            ),
-        ),
         "_experimental_use_coverage_metadata_files": attr.label(
             default = Label("//rust/settings:experimental_use_coverage_metadata_files"),
         ),

test/toolchain/toolchain_test.bzl

@@ -81,15 +81,13 @@ toolchain_adds_rustc_flags_lib_test = analysistest.make(
     _toolchain_adds_rustc_flags_lib_impl,
     config_settings = {
         str(Label("//:extra_rustc_flags")): [CONFIG_FLAG],
-        str(Label("//rust/settings:experimental_toolchain_generated_sysroot")): True,
     },
 )
 
 toolchain_adds_rustc_flags_shared_lib_test = analysistest.make(
     _toolchain_adds_rustc_flags_shared_lib_impl,
     config_settings = {
         str(Label("//:extra_rustc_flags")): [CONFIG_FLAG],
-        str(Label("//rust/settings:experimental_toolchain_generated_sysroot")): True,
     },
 )