Flip --incompatible_disable_legacy_crosstool_fields and --incompatibl…

…e_disable_expand_if_all_available_in_flag_set Fixes #7008 Fixes #6861 RELNOTES: `--incompatible_disable_legacy_crosstool_fields` has been flipped (#6861) `--incompatible_disable_expand_if_all_available_in_flag_set` has been flipped (#7008) PiperOrigin-RevId: 234759266 Change-Id: I54a1213991b161ccddfebdcd3ba83239adf0c66d
bazelbuild · Mar 11, 2019 · cf1404d · cf1404d
1 parent 2c1d792
commit cf1404d
Show file tree

Hide file tree

Showing 4 changed files with 632 additions and 628 deletions.
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
@@ -710,7 +710,7 @@ public Label getFdoPrefetchHintsLabel() {
   @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 @@ public Label getFdoPrefetchHintsLabel() {
 
   @Option(
       name = "incompatible_disable_expand_if_all_available_in_flag_set",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {