aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java
diff options
context:
space:
mode:
authorGravatar John Cater <jcater@google.com>2018-02-23 08:01:28 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-23 08:03:36 -0800
commit4ccecae85c12086e9610b67b50d21f5470fa89b6 (patch)
tree6108df78620dd19a470413233e286cba82328b8b /src/main/java
parent246f0aa048aeb3f456c89565e1e3021957b6cef4 (diff)
Remove some default cc toolchain definitions.
Change-Id: Idb0c9fe770cd73c2760bee92997063c4c9b2e94e PiperOrigin-RevId: 186768436
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java3
2 files changed, 3 insertions, 4 deletions
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 4cab2d11a8..90631c1387 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
@@ -120,10 +120,6 @@ 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");
- builder.addWorkspaceFileSuffix(
- "register_toolchains('@bazel_tools//tools/cpp:dummy_cc_toolchain_type')\n");
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java
index 6d606d483a..4345fb4e90 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java
@@ -71,6 +71,9 @@ public class CcRules implements RuleSet {
builder.addRuleDefinition(new BazelCcLibraryRule());
builder.addRuleDefinition(new BazelCcIncLibraryRule());
builder.addRuleDefinition(new BazelCcImportRule());
+
+ builder.addWorkspaceFileSuffix(
+ "register_toolchains('@bazel_tools//tools/cpp:dummy_cc_toolchain')\n");
}
@Override