Change uses of cc_toolchain_type back to plain toolchain_type.

This is a prequisite to removing cc_toolchain_type entirely.

PiperOrigin-RevId: 198402472

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java b/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java
index 760d0904dd..0139ddfade 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java
@@ -30,6 +30,7 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Options;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Options.MakeVariableSource;
+import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.cmdline.Label;
 import java.util.TreeMap;
 
@@ -82,7 +83,10 @@ public class ToolchainType implements RuleConfiguredTargetFactory {
       ResolvedToolchainProviders providers =
           (ResolvedToolchainProviders)
               ruleContext.getToolchainContext().getResolvedToolchainProviders();
-      providers.getForToolchainType(ruleContext.getLabel()).addGlobalMakeVariables(fragmentBuilder);
+      ToolchainInfo toolchainInfo = providers.getForToolchainType(ruleContext.getLabel());
+      if (toolchainInfo != null) {
+        toolchainInfo.addGlobalMakeVariables(fragmentBuilder);
+      }
     } else {
       Class<? extends BuildConfiguration.Fragment> fragmentClass =
           fragmentMap.get(ruleContext.getLabel());