commit 72a53f17476aed8aab92bf08b01b14cd6d24a746
author jcater <jcater@google.com> Thu Nov 04 08:32:23 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Nov 04 08:33:44 2021 -0700
tree f03e705e281ff6d115da7ca4f2534f8751d971d3
parent f5db230d5298f3ecf50bd8638bcdc1e8a59a322e

Fix legacy CC toolchains suite to handle an empty string for the `--compiler` flag.

This seems to happen after some types of Starlark transition.

PiperOrigin-RevId: 407586479

src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
index ea9098e..314a1c4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.cpp;
 
-
+import com.google.common.base.Strings;
 import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.LicensesProvider;
@@ -45,7 +45,7 @@
 
     String transformedCpu = ruleContext.getConfiguration().getCpu();
     String compiler = cppConfiguration.getCompilerFromOptions();
-    String key = transformedCpu + (compiler == null ? "" : ("|" + compiler));
+    String key = transformedCpu + (Strings.isNullOrEmpty(compiler) ? "" : ("|" + compiler));
     Map<String, Label> toolchains =
         ruleContext.attributes().get("toolchains", BuildType.LABEL_DICT_UNARY);
     Label selectedCcToolchain = toolchains.get(key);