Skip to content

Commit

Permalink
Delete incompatible_no_rustc_sysroot_env (#2790)
Browse files Browse the repository at this point in the history
This flag has been flipped long enough and I haven't heard any
complaints.

closes #2429
  • Loading branch information
UebelAndre authored Aug 13, 2024
1 parent 5f03718 commit 0e2409e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
2 changes: 0 additions & 2 deletions rust/private/rustc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
7 changes: 0 additions & 7 deletions rust/settings/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 0 additions & 4 deletions rust/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down Expand Up @@ -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"),
),
Expand Down

0 comments on commit 0e2409e

Please sign in to comment.