File tree 3 files changed +0
-13
lines changed
3 files changed +0
-13
lines changed Original file line number Diff line number Diff line change @@ -1068,8 +1068,6 @@ def construct_arguments(
1068
1068
))
1069
1069
1070
1070
# Ensure the sysroot is set for the target platform
1071
- if not toolchain ._incompatible_no_rustc_sysroot_env :
1072
- env ["SYSROOT" ] = toolchain .sysroot
1073
1071
if toolchain ._experimental_toolchain_generated_sysroot :
1074
1072
rustc_flags .add (toolchain .sysroot , format = "--sysroot=%s" )
1075
1073
Original file line number Diff line number Diff line change @@ -98,13 +98,6 @@ bool_flag(
98
98
build_setting_default = False ,
99
99
)
100
100
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
-
108
101
# A flag to control whether the shell path from a shell toolchain (`@bazel_tools//tools/sh:toolchain_type`)
109
102
# is embedded into the bootstrap process wrapper for the `.sh` file.
110
103
bool_flag (
Original file line number Diff line number Diff line change @@ -698,7 +698,6 @@ def _rust_toolchain_impl(ctx):
698
698
_experimental_use_global_allocator = experimental_use_global_allocator ,
699
699
_experimental_use_coverage_metadata_files = ctx .attr ._experimental_use_coverage_metadata_files [BuildSettingInfo ].value ,
700
700
_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 ,
702
701
_no_std = no_std ,
703
702
)
704
703
return [
@@ -890,9 +889,6 @@ rust_toolchain = rule(
890
889
"This flag is only relevant when used together with --@rules_rust//rust/settings:experimental_use_global_allocator."
891
890
),
892
891
),
893
- "_incompatible_no_rustc_sysroot_env" : attr .label (
894
- default = Label ("//rust/settings:incompatible_no_rustc_sysroot_env" ),
895
- ),
896
892
"_no_std" : attr .label (
897
893
default = Label ("//:no_std" ),
898
894
),
You can’t perform that action at this time.
0 commit comments