1 files changed, 3 insertions, 3 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 13d382a6fd..683e3d6c96 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
@@ -184,11 +184,11 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
       Rule ccToolchainSuite = (Rule) crosstoolTop;
       ccToolchainLabel = NonconfigurableAttributeMapper.of(ccToolchainSuite)
           .get("toolchains", BuildType.LABEL_DICT_UNARY)
-          .get(toolchain.getTargetCpu());
+          .get(toolchain.getTargetCpu() + "|" + toolchain.getCompiler());
       if (ccToolchainLabel == null) {
         throw new InvalidConfigurationException(String.format(
-            "cc_toolchain_suite '%s' does not contain a toolchain for CPU '%s'",
-            crosstoolTopLabel, toolchain.getTargetCpu()));
+            "cc_toolchain_suite '%s' does not contain a toolchain for CPU '%s' and compiler '%s'",
+            crosstoolTopLabel, toolchain.getTargetCpu(), toolchain.getCompiler()));
       }
     } else {
       try {