1 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index 56e4c70e47..c64a9cc002 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -70,6 +70,7 @@ import com.google.devtools.build.lib.rules.apple.AppleConfiguration;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.apple.Platform;
 import com.google.devtools.build.lib.rules.apple.Platform.PlatformType;
+import com.google.devtools.build.lib.rules.cpp.CcToolchain;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider;
 import com.google.devtools.build.lib.rules.cpp.CppFileTypes;
 import com.google.devtools.build.lib.rules.cpp.CppHelper;
@@ -857,7 +858,7 @@ public abstract class CompilationSupport {
         extraLinkArgs,
         extraLinkInputs,
         dsymOutputType,
-        CppHelper.getToolchain(ruleContext, ":cc_toolchain"));
+        CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext));
   }
 
   /**
@@ -1465,8 +1466,10 @@ public abstract class CompilationSupport {
   @Nullable
   private CcToolchainProvider maybeGetCcToolchain() {
     // TODO(rduan): Remove this check once all rules are using the crosstool support.
-    if (ruleContext.attributes().has(":cc_toolchain", BuildType.LABEL)) {
-      return CppHelper.getToolchain(ruleContext, ":cc_toolchain");
+    if (ruleContext
+        .attributes()
+        .has(CcToolchain.CC_TOOLCHAIN_DEFAULT_ATTRIBUTE_NAME, BuildType.LABEL)) {
+      return CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext);
     } else {
       return null;
     }
@@ -1475,8 +1478,10 @@ public abstract class CompilationSupport {
   @Nullable
   private FdoSupportProvider maybeGetFdoSupport() {
     // TODO(rduan): Remove this check once all rules are using the crosstool support.
-    if (ruleContext.attributes().has(":cc_toolchain", BuildType.LABEL)) {
-      return CppHelper.getFdoSupport(ruleContext, ":cc_toolchain");
+    if (ruleContext
+        .attributes()
+        .has(CcToolchain.CC_TOOLCHAIN_DEFAULT_ATTRIBUTE_NAME, BuildType.LABEL)) {
+      return CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext);
     } else {
       return null;
     }