1 files changed, 9 insertions, 0 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 49a11a16f4..4e4e863b29 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
@@ -862,6 +862,15 @@ public class CppOptions extends FragmentOptions {
               + "crosstool variable.")
   public boolean enableLinkoptsInUserLinkFlags;
 
+  @Option(
+      name = "experimental_enable_cc_toolchain_label_from_crosstool_proto",
+      defaultValue = "true",
+      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;
+
   @Override
   public FragmentOptions getHost() {
     CppOptions host = (CppOptions) getDefault();