Skip to content

Commit 2824e05

Browse files
author
Vinh Tran
committed
Enable in-repo targets build with --sysroot by default instead of just CI
1 parent 364f130 commit 2824e05

File tree

15 files changed

+42
-2
lines changed

15 files changed

+42
-2
lines changed

.bazelci/presubmit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,8 @@ tasks:
9292
test_targets: *default_linux_targets
9393
build_flags:
9494
- "--compilation_mode=opt"
95-
- "--@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True"
9695
test_flags:
9796
- "--compilation_mode=opt"
98-
- "--@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True"
9997
macos_opt:
10098
name: Opt Mode
10199
platform: macos

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ coverage --combined_report=lcov
2020
# https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
2121
coverage --experimental_fetch_all_coverage_outputs
2222

23+
# Set --sysroot to stdlibs directory generated by rust_toolchain
24+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True
25+
2326
###############################################################################
2427
## Unique configuration groups
2528
###############################################################################

examples/.bazelrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ common --noenable_bzlmod
2121
# This import should always be last to allow users to override
2222
# settings for local development.
2323
try-import %workspace%/user.bazelrc
24+
25+
# Set --sysroot to stdlibs directory generated by rust_toolchain
26+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True
27+

examples/android/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ build --fat_apk_cpu=arm64-v8a
88
# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
99
# https://github.com/bazelbuild/rules_rust/issues/2181
1010
common --noenable_bzlmod
11+
12+
# Set --sysroot to stdlibs directory generated by rust_toolchain
13+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/bzlmod/hello_world/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ startup --windows_enable_symlinks
44
build:windows --enable_runfiles
55

66
build --experimental_enable_bzlmod
7+
8+
# Set --sysroot to stdlibs directory generated by rust_toolchain
9+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/crate_universe/.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ common --noenable_bzlmod
2626
# settings for local development.
2727
try-import %workspace%/user.bazelrc
2828

29+
# Set --sysroot to stdlibs directory generated by rust_toolchain
30+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/crate_universe/cargo_aliases/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ common --noenable_bzlmod
2020
# This import should always be last to allow users to override
2121
# settings for local development.
2222
try-import %workspace%/user.bazelrc
23+
24+
# Set --sysroot to stdlibs directory generated by rust_toolchain
25+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/crate_universe/cargo_remote/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ common --noenable_bzlmod
2020
# This import should always be last to allow users to override
2121
# settings for local development.
2222
try-import %workspace%/user.bazelrc
23+
24+
# Set --sysroot to stdlibs directory generated by rust_toolchain
25+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/crate_universe/cargo_workspace/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ common --noenable_bzlmod
2020
# This import should always be last to allow users to override
2121
# settings for local development.
2222
try-import %workspace%/user.bazelrc
23+
24+
# Set --sysroot to stdlibs directory generated by rust_toolchain
25+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/crate_universe/multi_package/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ common --noenable_bzlmod
2020
# This import should always be last to allow users to override
2121
# settings for local development.
2222
try-import %workspace%/user.bazelrc
23+
24+
# Set --sysroot to stdlibs directory generated by rust_toolchain
25+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/crate_universe/no_cargo_manifests/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ common --noenable_bzlmod
2020
# This import should always be last to allow users to override
2121
# settings for local development.
2222
try-import %workspace%/user.bazelrc
23+
24+
# Set --sysroot to stdlibs directory generated by rust_toolchain
25+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/crate_universe_unnamed/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ common --noenable_bzlmod
2121
# This import should always be last to allow users to override
2222
# settings for local development.
2323
try-import %workspace%/user.bazelrc
24+
25+
# Set --sysroot to stdlibs directory generated by rust_toolchain
26+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/ios/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ build --host_crosstool_top=@local_config_apple_cc//:toolchain
1111
# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
1212
# https://github.com/bazelbuild/rules_rust/issues/2181
1313
common --noenable_bzlmod
14+
15+
# Set --sysroot to stdlibs directory generated by rust_toolchain
16+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/ios_build/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ build --host_crosstool_top=@local_config_apple_cc//:toolchain
1111
# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
1212
# https://github.com/bazelbuild/rules_rust/issues/2181
1313
common --noenable_bzlmod
14+
15+
# Set --sysroot to stdlibs directory generated by rust_toolchain
16+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

examples/zig_cross_compiling/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ build --incompatible_enable_cc_toolchain_resolution
88
# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
99
# https://github.com/bazelbuild/rules_rust/issues/2181
1010
common --noenable_bzlmod
11+
12+
# Set --sysroot to stdlibs directory generated by rust_toolchain
13+
common --@rules_rust//rust/settings:experimental_toolchain_generated_sysroot=True

0 commit comments

Comments
 (0)