Remove some default cc toolchain definitions.
Change-Id: Idb0c9fe770cd73c2760bee92997063c4c9b2e94e
PiperOrigin-RevId: 186768436
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 4cab2d1..90631c1 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 @@
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 6d606d4..4345fb4 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 @@
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
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index 37356a7..6f94f5a 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -163,14 +163,8 @@
" target_compatible_with = [':mock_value'],",
")",
"toolchain(",
- " name = 'dummy_cc_toolchain_type',",
- " toolchain_type = ':toolchain_type',",
- " toolchain = ':dummy_cc_toolchain_impl',",
- ")",
- "filegroup(name = 'toolchain_category')",
- "toolchain(",
" name = 'dummy_cc_toolchain',",
- " toolchain_type = ':toolchain_category',",
+ " toolchain_type = ':toolchain_type',",
" toolchain = ':dummy_cc_toolchain_impl',",
")",
"load(':dummy_toolchain.bzl', 'dummy_toolchain')",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
index e45680d..d405ef8 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
@@ -41,8 +41,8 @@
assertThatEvaluationResult(result).hasEntryThat(toolchainsKey).isNotNull();
RegisteredToolchainsValue value = result.get(toolchainsKey);
- // We have two registered toolchains, and two default for c++
- assertThat(value.registeredToolchains()).hasSize(4);
+ // We have two registered toolchains, and a default for c++
+ assertThat(value.registeredToolchains()).hasSize(3);
assertThat(
value
diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index 8ae72fb..d78f2a8 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -216,12 +216,6 @@
toolchain_type = ":toolchain_type",
)
-toolchain(
- name = "dummy_cc_toolchain_type",
- toolchain = "dummy_cc_toolchain_impl",
- toolchain_type = ":toolchain_type",
-)
-
load(":dummy_toolchain.bzl", "dummy_toolchain")
dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/tools/cpp/BUILD.static b/tools/cpp/BUILD.static
index 92cefaa..6175a5a 100644
--- a/tools/cpp/BUILD.static
+++ b/tools/cpp/BUILD.static
@@ -141,12 +141,6 @@
toolchain_type = ":toolchain_type",
)
-toolchain(
- name = "dummy_cc_toolchain_type",
- toolchain = "dummy_cc_toolchain_impl",
- toolchain_type = ":toolchain_type",
-)
-
load(":dummy_toolchain.bzl", "dummy_toolchain")
dummy_toolchain(name = "dummy_cc_toolchain_impl")
diff --git a/tools/cpp/BUILD.tpl b/tools/cpp/BUILD.tpl
index 26a8a47..edf2ba6 100644
--- a/tools/cpp/BUILD.tpl
+++ b/tools/cpp/BUILD.tpl
@@ -108,12 +108,6 @@
toolchain_type = ":toolchain_type",
)
-toolchain(
- name = "dummy_cc_toolchain_type",
- toolchain = "dummy_cc_toolchain_impl",
- toolchain_type = ":toolchain_type",
-)
-
load(":dummy_toolchain.bzl", "dummy_toolchain")
dummy_toolchain(name = "dummy_cc_toolchain_impl")
