Skip to content

Commit 0e2409e

Browse files
authored
Delete incompatible_no_rustc_sysroot_env (#2790)
This flag has been flipped long enough and I haven't heard any complaints. closes #2429
1 parent 5f03718 commit 0e2409e

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed

rust/private/rustc.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,8 +1068,6 @@ def construct_arguments(
10681068
))
10691069

10701070
# Ensure the sysroot is set for the target platform
1071-
if not toolchain._incompatible_no_rustc_sysroot_env:
1072-
env["SYSROOT"] = toolchain.sysroot
10731071
if toolchain._experimental_toolchain_generated_sysroot:
10741072
rustc_flags.add(toolchain.sysroot, format = "--sysroot=%s")
10751073

rust/settings/BUILD.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,6 @@ bool_flag(
9898
build_setting_default = False,
9999
)
100100

101-
# A flag to remove the SYSROOT environment variable from `Rustc` actions.
102-
incompatible_flag(
103-
name = "incompatible_no_rustc_sysroot_env",
104-
build_setting_default = True,
105-
issue = "https://github.com/bazelbuild/rules_rust/issues/2429",
106-
)
107-
108101
# A flag to control whether the shell path from a shell toolchain (`@bazel_tools//tools/sh:toolchain_type`)
109102
# is embedded into the bootstrap process wrapper for the `.sh` file.
110103
bool_flag(

rust/toolchain.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,6 @@ def _rust_toolchain_impl(ctx):
698698
_experimental_use_global_allocator = experimental_use_global_allocator,
699699
_experimental_use_coverage_metadata_files = ctx.attr._experimental_use_coverage_metadata_files[BuildSettingInfo].value,
700700
_experimental_toolchain_generated_sysroot = ctx.attr._experimental_toolchain_generated_sysroot[IncompatibleFlagInfo].enabled,
701-
_incompatible_no_rustc_sysroot_env = ctx.attr._incompatible_no_rustc_sysroot_env[IncompatibleFlagInfo].enabled,
702701
_no_std = no_std,
703702
)
704703
return [
@@ -890,9 +889,6 @@ rust_toolchain = rule(
890889
"This flag is only relevant when used together with --@rules_rust//rust/settings:experimental_use_global_allocator."
891890
),
892891
),
893-
"_incompatible_no_rustc_sysroot_env": attr.label(
894-
default = Label("//rust/settings:incompatible_no_rustc_sysroot_env"),
895-
),
896892
"_no_std": attr.label(
897893
default = Label("//:no_std"),
898894
),

0 commit comments

Comments
 (0)