From 51f76dbb931b025c6066af91e8c53a9715014b8a Mon Sep 17 00:00:00 2001
From: cpeyser <cpeyser@google.com>
Date: Fri, 7 Jul 2017 11:19:45 -0400
Subject: Platform -> ApplePlatform, to avoid ambiguity with the newly
 introduced Platform rule.

PiperOrigin-RevId: 161203491
---
 src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index 6a130fcc8e..f2298b81a8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -33,7 +33,7 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.rules.apple.Platform;
+import com.google.devtools.build.lib.rules.apple.ApplePlatform;
 import com.google.devtools.build.lib.rules.cpp.CcLibraryHelper.SourceCategory;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables;
@@ -135,7 +135,8 @@ public final class CcCommon {
       }
     }
 
-    if (Platform.isApplePlatform(cppConfiguration.getTargetCpu()) && result.contains("-static")) {
+    if (ApplePlatform.isApplePlatform(cppConfiguration.getTargetCpu())
+        && result.contains("-static")) {
       ruleContext.attributeError(
           "linkopts", "Apple builds do not support statically linked binaries");
     }
-- 
cgit v1.2.3