Remove support for filegroup-based C++ toolchains:

RELNOTES[INC]: filegroup-based C++ toolchains are not supported anymore. --*_crosstool_top options must always point to a cc_toolchain_suite rule (or an alias of one).

--
MOS_MIGRATED_REVID=132410829

1 files changed, 3 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
index c59480fb96..6a62afdce4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
@@ -188,13 +188,9 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
             crosstoolTopLabel, toolchain.getTargetCpu(), toolchain.getCompiler()));
       }
     } else {
-      try {
-        ccToolchainLabel = crosstoolTopLabel.getRelative("cc-compiler-" + toolchain.getTargetCpu());
-      } catch (LabelSyntaxException e) {
-        throw new InvalidConfigurationException(String.format(
-            "'%s' is not a valid CPU. It should only consist of characters valid in labels",
-            toolchain.getTargetCpu()));
-      }
+      throw new InvalidConfigurationException(String.format(
+          "The specified --crosstool_top '%s' is not a valid cc_toolchain_suite rule",
+          crosstoolTopLabel));
     }
 
     Target ccToolchain;