From 0e2409efc34b0fb3922858b0dc9bc33d2a8b9f82 Mon Sep 17 00:00:00 2001 From: UebelAndre Date: Tue, 13 Aug 2024 09:51:04 -0700 Subject: [PATCH] Delete `incompatible_no_rustc_sysroot_env` (#2790) This flag has been flipped long enough and I haven't heard any complaints. closes https://github.com/bazelbuild/rules_rust/issues/2429 --- rust/private/rustc.bzl | 2 -- rust/settings/BUILD.bazel | 7 ------- rust/toolchain.bzl | 4 ---- 3 files changed, 13 deletions(-) diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl index 8abf103657..68671387d9 100644 --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl @@ -1068,8 +1068,6 @@ def construct_arguments( )) # Ensure the sysroot is set for the target platform - if not toolchain._incompatible_no_rustc_sysroot_env: - env["SYSROOT"] = toolchain.sysroot if toolchain._experimental_toolchain_generated_sysroot: rustc_flags.add(toolchain.sysroot, format = "--sysroot=%s") diff --git a/rust/settings/BUILD.bazel b/rust/settings/BUILD.bazel index 10f59ed62f..2a73cf190a 100644 --- a/rust/settings/BUILD.bazel +++ b/rust/settings/BUILD.bazel @@ -98,13 +98,6 @@ bool_flag( build_setting_default = False, ) -# A flag to remove the SYSROOT environment variable from `Rustc` actions. -incompatible_flag( - name = "incompatible_no_rustc_sysroot_env", - build_setting_default = True, - issue = "https://github.com/bazelbuild/rules_rust/issues/2429", -) - # A flag to control whether the shell path from a shell toolchain (`@bazel_tools//tools/sh:toolchain_type`) # is embedded into the bootstrap process wrapper for the `.sh` file. bool_flag( diff --git a/rust/toolchain.bzl b/rust/toolchain.bzl index 62164db4b3..1ff73e6c8a 100644 --- a/rust/toolchain.bzl +++ b/rust/toolchain.bzl @@ -698,7 +698,6 @@ def _rust_toolchain_impl(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, - _incompatible_no_rustc_sysroot_env = ctx.attr._incompatible_no_rustc_sysroot_env[IncompatibleFlagInfo].enabled, _no_std = no_std, ) return [ @@ -890,9 +889,6 @@ rust_toolchain = rule( "This flag is only relevant when used together with --@rules_rust//rust/settings:experimental_use_global_allocator." ), ), - "_incompatible_no_rustc_sysroot_env": attr.label( - default = Label("//rust/settings:incompatible_no_rustc_sysroot_env"), - ), "_no_std": attr.label( default = Label("//:no_std"), ),