From 7e348c4ebc7f09a5d51f0cbf46a4057de85b5145 Mon Sep 17 00:00:00 2001 From: UebelAndre Date: Tue, 30 Sep 2025 15:50:23 -0700 Subject: [PATCH] Delete old bazelrc flag no longer used for testing --- .bazelrc | 3 --- examples/all_crate_deps/.bazelrc | 3 --- examples/all_deps_vendor/.bazelrc | 3 --- examples/android/.bazelrc | 3 --- examples/bazel_env/.bazelrc | 3 --- examples/compile_opt/.bazelrc | 3 --- examples/crate_universe/.bazelrc | 3 --- examples/crate_universe_local_path/.bazelrc | 3 --- examples/cross_compile/.bazelrc | 3 --- examples/hello_world/.bazelrc | 3 --- examples/hello_world_no_cargo/.bazelrc | 3 --- examples/ios/.bazelrc | 3 --- examples/ios_build/.bazelrc | 3 --- examples/musl_cross_compiling/.bazelrc | 3 --- examples/nix_cross_compiling/.bazelrc | 3 --- examples/override_target/.bazelrc | 3 --- examples/proto/.bazelrc | 3 --- examples/proto_with_toolchain/.bazelrc | 3 --- examples/sys/.bazelrc | 3 --- extensions/bindgen/.bazelrc | 3 --- extensions/mdbook/.bazelrc | 3 --- extensions/prost/.bazelrc | 3 --- extensions/protobuf/.bazelrc | 3 --- extensions/wasm_bindgen/.bazelrc | 3 --- test/integration/cc_common_link/.bazelrc | 3 --- test/integration/cc_common_link_with_global_alloc/.bazelrc | 3 --- test/integration/no_std/.bazelrc | 3 --- 27 files changed, 81 deletions(-) diff --git a/.bazelrc b/.bazelrc index 325b24b0aa..496f91b705 100644 --- a/.bazelrc +++ b/.bazelrc @@ -56,9 +56,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/all_crate_deps/.bazelrc b/examples/all_crate_deps/.bazelrc index 82c4392d5a..a150dc0819 100644 --- a/examples/all_crate_deps/.bazelrc +++ b/examples/all_crate_deps/.bazelrc @@ -1,8 +1,5 @@ # This isn't currently the default in Bazel, but we enable it to test we'll be ready if/when it flips. build --incompatible_disallow_empty_glob -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/all_deps_vendor/.bazelrc b/examples/all_deps_vendor/.bazelrc index e17335d9e0..0843729592 100644 --- a/examples/all_deps_vendor/.bazelrc +++ b/examples/all_deps_vendor/.bazelrc @@ -41,9 +41,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/android/.bazelrc b/examples/android/.bazelrc index 475821957f..9d50dcd516 100644 --- a/examples/android/.bazelrc +++ b/examples/android/.bazelrc @@ -61,9 +61,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - ############################################################################### ## Bzlmod ############################################################################### diff --git a/examples/bazel_env/.bazelrc b/examples/bazel_env/.bazelrc index fda9a43f16..9ee8d0e272 100644 --- a/examples/bazel_env/.bazelrc +++ b/examples/bazel_env/.bazelrc @@ -30,9 +30,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/compile_opt/.bazelrc b/examples/compile_opt/.bazelrc index 7a58087677..3d9c973c4f 100644 --- a/examples/compile_opt/.bazelrc +++ b/examples/compile_opt/.bazelrc @@ -1,9 +1,6 @@ # This isn't currently the default in Bazel, but we enable it to test we'll be ready if/when it flips. build --incompatible_disallow_empty_glob -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/crate_universe/.bazelrc b/examples/crate_universe/.bazelrc index 647a2afc3e..883f004db4 100644 --- a/examples/crate_universe/.bazelrc +++ b/examples/crate_universe/.bazelrc @@ -23,9 +23,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/crate_universe_local_path/.bazelrc b/examples/crate_universe_local_path/.bazelrc index 8c7e2612ee..adc2d04be5 100644 --- a/examples/crate_universe_local_path/.bazelrc +++ b/examples/crate_universe_local_path/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/cross_compile/.bazelrc b/examples/cross_compile/.bazelrc index e17335d9e0..0843729592 100644 --- a/examples/cross_compile/.bazelrc +++ b/examples/cross_compile/.bazelrc @@ -41,9 +41,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/hello_world/.bazelrc b/examples/hello_world/.bazelrc index b8a688b783..729e630c88 100644 --- a/examples/hello_world/.bazelrc +++ b/examples/hello_world/.bazelrc @@ -38,9 +38,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/hello_world_no_cargo/.bazelrc b/examples/hello_world_no_cargo/.bazelrc index e17335d9e0..0843729592 100644 --- a/examples/hello_world_no_cargo/.bazelrc +++ b/examples/hello_world_no_cargo/.bazelrc @@ -41,9 +41,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/ios/.bazelrc b/examples/ios/.bazelrc index f3e5a5d06f..58a695f4bf 100644 --- a/examples/ios/.bazelrc +++ b/examples/ios/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - ############################################################################### ## Bzlmod ############################################################################### diff --git a/examples/ios_build/.bazelrc b/examples/ios_build/.bazelrc index f3e5a5d06f..58a695f4bf 100644 --- a/examples/ios_build/.bazelrc +++ b/examples/ios_build/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - ############################################################################### ## Bzlmod ############################################################################### diff --git a/examples/musl_cross_compiling/.bazelrc b/examples/musl_cross_compiling/.bazelrc index 8c7e2612ee..adc2d04be5 100644 --- a/examples/musl_cross_compiling/.bazelrc +++ b/examples/musl_cross_compiling/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/nix_cross_compiling/.bazelrc b/examples/nix_cross_compiling/.bazelrc index 3c53fbb928..8b982d723b 100644 --- a/examples/nix_cross_compiling/.bazelrc +++ b/examples/nix_cross_compiling/.bazelrc @@ -69,9 +69,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/override_target/.bazelrc b/examples/override_target/.bazelrc index 82c4392d5a..a150dc0819 100644 --- a/examples/override_target/.bazelrc +++ b/examples/override_target/.bazelrc @@ -1,8 +1,5 @@ # This isn't currently the default in Bazel, but we enable it to test we'll be ready if/when it flips. build --incompatible_disallow_empty_glob -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/proto/.bazelrc b/examples/proto/.bazelrc index e5b903ffbe..6d8939cc98 100644 --- a/examples/proto/.bazelrc +++ b/examples/proto/.bazelrc @@ -41,9 +41,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/proto_with_toolchain/.bazelrc b/examples/proto_with_toolchain/.bazelrc index e5b903ffbe..6d8939cc98 100644 --- a/examples/proto_with_toolchain/.bazelrc +++ b/examples/proto_with_toolchain/.bazelrc @@ -41,9 +41,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/examples/sys/.bazelrc b/examples/sys/.bazelrc index e17335d9e0..0843729592 100644 --- a/examples/sys/.bazelrc +++ b/examples/sys/.bazelrc @@ -41,9 +41,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/extensions/bindgen/.bazelrc b/extensions/bindgen/.bazelrc index a1fc7780af..a2e6587a8e 100644 --- a/extensions/bindgen/.bazelrc +++ b/extensions/bindgen/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/extensions/mdbook/.bazelrc b/extensions/mdbook/.bazelrc index a1fc7780af..a2e6587a8e 100644 --- a/extensions/mdbook/.bazelrc +++ b/extensions/mdbook/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/extensions/prost/.bazelrc b/extensions/prost/.bazelrc index a1fc7780af..a2e6587a8e 100644 --- a/extensions/prost/.bazelrc +++ b/extensions/prost/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/extensions/protobuf/.bazelrc b/extensions/protobuf/.bazelrc index a1fc7780af..a2e6587a8e 100644 --- a/extensions/protobuf/.bazelrc +++ b/extensions/protobuf/.bazelrc @@ -53,9 +53,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/extensions/wasm_bindgen/.bazelrc b/extensions/wasm_bindgen/.bazelrc index e459b2c912..965ff4b0f1 100644 --- a/extensions/wasm_bindgen/.bazelrc +++ b/extensions/wasm_bindgen/.bazelrc @@ -61,9 +61,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/test/integration/cc_common_link/.bazelrc b/test/integration/cc_common_link/.bazelrc index 5a87dbae73..aa7332a5e1 100644 --- a/test/integration/cc_common_link/.bazelrc +++ b/test/integration/cc_common_link/.bazelrc @@ -25,9 +25,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/test/integration/cc_common_link_with_global_alloc/.bazelrc b/test/integration/cc_common_link_with_global_alloc/.bazelrc index 9cb01c8f00..f6c4970be9 100644 --- a/test/integration/cc_common_link_with_global_alloc/.bazelrc +++ b/test/integration/cc_common_link_with_global_alloc/.bazelrc @@ -26,9 +26,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally= diff --git a/test/integration/no_std/.bazelrc b/test/integration/no_std/.bazelrc index cab64f52a3..833dfdca2d 100644 --- a/test/integration/no_std/.bazelrc +++ b/test/integration/no_std/.bazelrc @@ -69,9 +69,6 @@ build --incompatible_disallow_empty_glob=true # https://github.com/bazelbuild/bazel/issues/12821 build --nolegacy_external_runfiles -# Required for cargo_build_script support before Bazel 7 -build --incompatible_merge_fixed_and_default_shell_env - # https://github.com/bazelbuild/bazel/issues/23043. build --incompatible_autoload_externally=