Delete old bazelrc flag no longer used for testing (#3649)
We no longer test versions below Bazel 7
diff --git a/.bazelrc b/.bazelrc
index 325b24b..496f91b 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -56,9 +56,6 @@
# 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 82c4392..a150dc0 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 e17335d..0843729 100644
--- a/examples/all_deps_vendor/.bazelrc
+++ b/examples/all_deps_vendor/.bazelrc
@@ -41,9 +41,6 @@
# 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 4758219..9d50dcd 100644
--- a/examples/android/.bazelrc
+++ b/examples/android/.bazelrc
@@ -61,9 +61,6 @@
# 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 fda9a43..9ee8d0e 100644
--- a/examples/bazel_env/.bazelrc
+++ b/examples/bazel_env/.bazelrc
@@ -30,9 +30,6 @@
# 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 7a58087..3d9c973 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 647a2af..883f004 100644
--- a/examples/crate_universe/.bazelrc
+++ b/examples/crate_universe/.bazelrc
@@ -23,9 +23,6 @@
# 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 8c7e261..adc2d04 100644
--- a/examples/crate_universe_local_path/.bazelrc
+++ b/examples/crate_universe_local_path/.bazelrc
@@ -53,9 +53,6 @@
# 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 e17335d..0843729 100644
--- a/examples/cross_compile/.bazelrc
+++ b/examples/cross_compile/.bazelrc
@@ -41,9 +41,6 @@
# 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 b8a688b..729e630 100644
--- a/examples/hello_world/.bazelrc
+++ b/examples/hello_world/.bazelrc
@@ -38,9 +38,6 @@
# 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 e17335d..0843729 100644
--- a/examples/hello_world_no_cargo/.bazelrc
+++ b/examples/hello_world_no_cargo/.bazelrc
@@ -41,9 +41,6 @@
# 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 f3e5a5d..58a695f 100644
--- a/examples/ios/.bazelrc
+++ b/examples/ios/.bazelrc
@@ -53,9 +53,6 @@
# 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 f3e5a5d..58a695f 100644
--- a/examples/ios_build/.bazelrc
+++ b/examples/ios_build/.bazelrc
@@ -53,9 +53,6 @@
# 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 8c7e261..adc2d04 100644
--- a/examples/musl_cross_compiling/.bazelrc
+++ b/examples/musl_cross_compiling/.bazelrc
@@ -53,9 +53,6 @@
# 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 3c53fbb..8b982d7 100644
--- a/examples/nix_cross_compiling/.bazelrc
+++ b/examples/nix_cross_compiling/.bazelrc
@@ -69,9 +69,6 @@
# 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 82c4392..a150dc0 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 e5b903f..6d8939c 100644
--- a/examples/proto/.bazelrc
+++ b/examples/proto/.bazelrc
@@ -41,9 +41,6 @@
# 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 e5b903f..6d8939c 100644
--- a/examples/proto_with_toolchain/.bazelrc
+++ b/examples/proto_with_toolchain/.bazelrc
@@ -41,9 +41,6 @@
# 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 e17335d..0843729 100644
--- a/examples/sys/.bazelrc
+++ b/examples/sys/.bazelrc
@@ -41,9 +41,6 @@
# 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 a1fc778..a2e6587 100644
--- a/extensions/bindgen/.bazelrc
+++ b/extensions/bindgen/.bazelrc
@@ -53,9 +53,6 @@
# 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 a1fc778..a2e6587 100644
--- a/extensions/mdbook/.bazelrc
+++ b/extensions/mdbook/.bazelrc
@@ -53,9 +53,6 @@
# 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 a1fc778..a2e6587 100644
--- a/extensions/prost/.bazelrc
+++ b/extensions/prost/.bazelrc
@@ -53,9 +53,6 @@
# 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 a1fc778..a2e6587 100644
--- a/extensions/protobuf/.bazelrc
+++ b/extensions/protobuf/.bazelrc
@@ -53,9 +53,6 @@
# 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 e459b2c..965ff4b 100644
--- a/extensions/wasm_bindgen/.bazelrc
+++ b/extensions/wasm_bindgen/.bazelrc
@@ -61,9 +61,6 @@
# 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 5a87dba..aa7332a 100644
--- a/test/integration/cc_common_link/.bazelrc
+++ b/test/integration/cc_common_link/.bazelrc
@@ -25,9 +25,6 @@
# 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 9cb01c8..f6c4970 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 @@
# 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 cab64f5..833dfdc 100644
--- a/test/integration/no_std/.bazelrc
+++ b/test/integration/no_std/.bazelrc
@@ -69,9 +69,6 @@
# 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=
