From 94830ffce692d923e73c03bfa1f6842115c02055 Mon Sep 17 00:00:00 2001
From: John Cater <jcater@google.com>
Date: Tue, 13 Mar 2018 09:21:30 -0700
Subject: Add a helper method for checking whether toolchain resolution is
 enabled for a toolchain type.

Closes #4832.

Change-Id: Ia4fce6dd7003dc441f81ea7ca65ce865ca222142
PiperOrigin-RevId: 188882041
---
 .../java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java   | 5 ++---
 .../java/com/google/devtools/build/lib/rules/cpp/CppHelper.java     | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
index a62abb5a16..b901340569 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
@@ -675,9 +675,8 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
     PlatformConfiguration platformConfig =
         Preconditions.checkNotNull(ruleContext.getFragment(PlatformConfiguration.class));
 
-    if (!platformConfig
-        .getEnabledToolchainTypes()
-        .contains(CppHelper.getToolchainTypeFromRuleClass(ruleContext))) {
+    if (!platformConfig.isToolchainTypeEnabled(
+        CppHelper.getToolchainTypeFromRuleClass(ruleContext))) {
       return null;
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index f3e22be1b8..deeca3e78b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -158,8 +158,7 @@ public class CppHelper {
             == MakeVariableSource.TOOLCHAIN)
         && (ruleContext
             .getFragment(PlatformConfiguration.class)
-            .getEnabledToolchainTypes()
-            .contains(toolchainType));
+            .isToolchainTypeEnabled(toolchainType));
   }
 
   /**
@@ -527,8 +526,7 @@ public class CppHelper {
     if (toolchainType != null
         && ruleContext
             .getFragment(PlatformConfiguration.class)
-            .getEnabledToolchainTypes()
-            .contains(toolchainType)) {
+            .isToolchainTypeEnabled(toolchainType)) {
       return getToolchainFromPlatformConstraints(ruleContext, toolchainType);
     }
     return getToolchainFromCrosstoolTop(ruleContext, dep);
-- 
cgit v1.2.3