Enable --incompatible_disable_sysroot_from_configuration by default.

Incompatible change issue: #6565. Part of overall sysroot cleanup in #6543. RELNOTES: Turn on --incompatible_disable_sysroot_from_configuration Closes #6614. PiperOrigin-RevId: 220647100
bazelbuild · Nov 8, 2018 · efc4338 · efc4338
1 parent 49673bd
commit efc4338
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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
@@ -897,7 +897,7 @@ public Label getFdoPrefetchHintsLabel() {
   // TODO(--incompatible_disable_systool_from_configration): Deprecate the feature and remove.
   @Option(
       name = "incompatible_disable_sysroot_from_configuration",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java
@@ -901,7 +901,7 @@ public void testSysroot_fromCrosstool() throws Exception {
         .setupCrosstool(
             mockToolsConfig,
             CrosstoolConfig.CToolchain.newBuilder().setDefaultGrteTop("//libc1").buildPartial());
-    useConfiguration();
+    useConfiguration("--incompatible_disable_sysroot_from_configuration=false");
     ConfiguredTarget target = getConfiguredTarget("//a:b");
     CcToolchainProvider toolchainProvider =
         (CcToolchainProvider) target.get(ToolchainInfo.PROVIDER);