diff options
| author |  cpeyser <cpeyser@google.com> | 2017-07-07 11:19:45 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-07-07 13:37:48 -0400 |
| commit | 51f76dbb931b025c6066af91e8c53a9715014b8a (patch) | |
| tree | fffe127f1dfc1d9bca4663ae95bae7421af0f0b1 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java | |
| parent | 38f74a23738f8f1e0e0e3bc49d41a479f311dbe9 (diff) | |
Platform -> ApplePlatform, to avoid ambiguity with the newly introduced
Platform rule.
PiperOrigin-RevId: 161203491
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java | 5 |
1 files changed, 3 insertions, 2 deletions
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"); } |