Flip --incompatible_disable_legacy_crosstool_fields and --incompatible_disable_expand_if_all_available_in_flag_set
Fixes #7008
Fixes #6861
This is an encore of https://github.com/bazelbuild/bazel/commit/c18be0b0a0bf626edb98ac684fc579059af38b8c.
TESTED=https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/852#5c90f69e-c5d2-44c1-8067-0bde4cba6f6d (remote execution is fixed after syncing, verified locally)
RELNOTES: `--incompatible_disable_legacy_crosstool_fields` has been flipped (https://github.com/bazelbuild/bazel/issues/6861)
`--incompatible_disable_expand_if_all_available_in_flag_set` has been flipped (https://github.com/bazelbuild/bazel/issues/7008)
PiperOrigin-RevId: 239567807
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index 8aee226..21a49ee 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -710,7 +710,7 @@
@Option(
name = "incompatible_disable_legacy_crosstool_fields",
oldName = "experimental_disable_legacy_crosstool_fields",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {
@@ -753,7 +753,7 @@
@Option(
name = "incompatible_disable_expand_if_all_available_in_flag_set",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {
