Skip to content

Commit

Permalink
Default experimental_toolchain_generated_sysroot to True (#2277)
Browse files Browse the repository at this point in the history
#2223 only sets
`--@rules_rust//rust/settings:experimental_toolchain_generated_sysroot`
in a few targets on CI. This PR defaults the feature flag to `True`.

This ensures the feature flag works at a larger scope because we remove
it.

---------

Co-authored-by: UebelAndre <[email protected]>
  • Loading branch information
Vinh Tran and UebelAndre authored Nov 25, 2023
1 parent 4aa6550 commit a09c6d9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,8 @@ tasks:
test_targets: *default_linux_targets
build_flags:
- "--compilation_mode=opt"
- "--@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True"
test_flags:
- "--compilation_mode=opt"
- "--@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True"
macos_opt:
name: Opt Mode
platform: macos
Expand Down
2 changes: 1 addition & 1 deletion rust/settings/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ bzl_library(
# A flag to set rustc --sysroot flag to the sysroot generated by rust_toolchain
incompatible_flag(
name = "experimental_toolchain_generated_sysroot",
build_setting_default = False,
build_setting_default = True,
issue = "https://github.com/bazelbuild/rules_rust/issues/2039",
)

0 comments on commit a09c6d9

Please sign in to comment.