From a4c82eb87d22c2d490142557cc47e2172659be73 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Mon, 12 Sep 2022 08:31:53 +0000
Subject: [PATCH] Flip cc toolchain resolution.

---
 .../com/google/devtools/build/lib/rules/cpp/CppOptions.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2be96b19ae0697..74223851814008 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
@@ -878,7 +878,7 @@ public Label getPropellerOptimizeLabel() {
 
   @Option(
       name = "incompatible_enable_cc_toolchain_resolution",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},