Adds the compiler to the key for selecting the cc_toolchain label in

cc_toolchain_suite. This will allow selecting the correct toolchain based on
--compiler / --android_compiler.

RELNOTES: The key for the map to cc_toolchain_suite.toolchains is now a string
of the form "cpu|compiler" (previously, it was just "cpu").

--
MOS_MIGRATED_REVID=121418076

1 files changed, 4 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java
index 2250e81de4..e72ddb5efb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuiteTest.java
@@ -33,7 +33,9 @@ public class CcToolchainSuiteTest extends BuildViewTestCase {
         "cc_toolchain_suite(",
         "    name = 'suite',",
         "    toolchains = { ",
-        "       'cpu': ':cc-toolchain', 'k8': ':cc-toolchain', 'darwin': ':cc-toolchain' ",
+        "       'cpu|cpu-compiler': ':cc-toolchain',",
+        "       'k8|k8-compiler': ':cc-toolchain',",
+        "       'darwin|cpu-compiler': ':cc-toolchain' ",
         "    },",
         "    proto = \"\"\"",
         "major_version: 'v1'",
@@ -116,5 +118,6 @@ public class CcToolchainSuiteTest extends BuildViewTestCase {
     CppConfiguration cppConfig = getTargetConfiguration().getFragment(CppConfiguration.class);
     assertThat(cppConfig.getTargetCpu()).isEqualTo("cpu");
     assertThat(cppConfig.getAbi()).isEqualTo("cpu-abi");
+    assertThat(cppConfig.getCompiler()).isEqualTo("cpu-compiler");
   }
 }