From efc43383e523ba9e0f12f78e282c464e1f3601ca Mon Sep 17 00:00:00 2001
From: John Cater <jcater@google.com>
Date: Thu, 8 Nov 2018 09:06:13 -0800
Subject: [PATCH] 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
---
 .../com/google/devtools/build/lib/rules/cpp/CppOptions.java     | 2 +-
 .../google/devtools/build/lib/rules/cpp/CcToolchainTest.java    | 2 +-
 2 files changed, 2 insertions(+), 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
index 01c7be096e6046..cca8f851bffd75 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
@@ -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
index e394d363927737..87c396480c8ea8 100644
--- 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);