commit a792821ab6287f38b05636da36a3c5f8ab805535
author rosica <rosica@google.com> Thu Sep 06 04:17:02 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Sep 06 04:18:39 2018 -0700
tree c4fa4e0bd9429d02bb4a5831699026ab15ef2763
parent f87f892cb0ef79063247beb9699765ab1fdca785

Rename --experimental_enable_cc_toolchain_label_from_crosstool_proto to --incompatible_disable_cc_toolchain_label_from_crosstool_proto to comply with the backward compatibility policy.

RELNOTES: None.
PiperOrigin-RevId: 211784211

src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
index 36827f9..3c6e91b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
@@ -200,7 +200,7 @@
             CrosstoolConfigurationLoader.selectToolchain(
                 file.getProto(), options, cpuTransformer.getTransformer());
         ccToolchainLabel = toolchains.get(toolchain.getTargetCpu() + "|" + toolchain.getCompiler());
-        if (!cppOptions.enableCcToolchainFromCrosstool) {
+        if (cppOptions.disableCcToolchainFromCrosstool) {
           throw new InvalidConfigurationException(
               errorMessage
                   + String.format(

src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java

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 4c6d078..511cc1e 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
@@ -859,13 +859,17 @@
   public boolean disableEmittingStaticLibgcc;
 
   @Option(
-      name = "experimental_enable_cc_toolchain_label_from_crosstool_proto",
-      defaultValue = "true",
+      name = "incompatible_disable_cc_toolchain_label_from_crosstool_proto",
+      defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.EAGERNESS_TO_EXIT},
-      metadataTags = {OptionMetadataTag.EXPERIMENTAL},
-      help = "If false, Bazel will not use the CROSSTOOL file to select the cc_toolchain label.")
-  public boolean enableCcToolchainFromCrosstool;
+      metadataTags = {
+        OptionMetadataTag.EXPERIMENTAL,
+        OptionMetadataTag.INCOMPATIBLE_CHANGE,
+        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+      },
+      help = "If true, Bazel will not use the CROSSTOOL file to select the cc_toolchain label.")
+  public boolean disableCcToolchainFromCrosstool;
 
   @Option(
       name = "experimental_enable_cc_toolchain_config_info",

src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java
index 4e1247f..5615adc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java
@@ -813,7 +813,7 @@
           "--crosstool_top=//cc:suite",
           "--cpu=k8",
           "--compiler=compiler",
-          "--experimental_enable_cc_toolchain_label_from_crosstool_proto=false");
+          "--incompatible_disable_cc_toolchain_label_from_crosstool_proto");
       getConfiguredTarget("//a:b");
       fail("Expected failure because selecting cc_toolchain label from CROSSTOOL is disabled");
     } catch (InvalidConfigurationException e) {