From a5d95127aae787769ae61fca323c143d1e21c558 Mon Sep 17 00:00:00 2001
From: cpeyser <cpeyser@google.com>
Date: Wed, 27 Sep 2017 11:25:32 -0400
Subject: Mock cc toolchain is registered in module instead of in
 PlatformOptions.

PiperOrigin-RevId: 170200236
---
 .../java/com/google/devtools/build/lib/analysis/PlatformOptions.java    | 2 +-
 .../google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java   | 2 ++
 .../java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib')

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
index fb96bcdbc5..6a53a5a34a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
@@ -60,7 +60,7 @@ public class PlatformOptions extends FragmentOptions {
   @Option(
     name = "extra_toolchains",
     converter = LabelListConverter.class,
-    defaultValue = "@bazel_tools//tools/cpp:dummy_cc_toolchain",
+    defaultValue = "",
     documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
     effectTags = {OptionEffectTag.UNKNOWN},
     metadataTags = {OptionMetadataTag.HIDDEN},
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
index 54bfabc689..c9749efa91 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -215,6 +215,8 @@ public class BazelRuleClassProvider {
           builder.addConfigurationFragment(new BazelConfiguration.Loader());
           builder.addConfigurationOptions(BazelConfiguration.Options.class);
           builder.addConfigurationOptions(BuildConfiguration.Options.class);
+          builder.addWorkspaceFileSuffix(
+              "register_toolchains('@bazel_tools//tools/cpp:dummy_cc_toolchain')\n");
         }
 
         @Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index 7e6b7acae8..56477bdbcd 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -610,7 +610,7 @@ public final class SkyframeBuildView {
    * #createConfiguredTarget}, and false immediately after the call. Use it to fail-fast in the case
    * that a target is requested for analysis not during the analysis phase.
    */
-  void enableAnalysis(boolean enable) {
+  public void enableAnalysis(boolean enable) {
     this.enableAnalysis = enable;
   }
 
-- 
cgit v1.2.3