diff options
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 53d5fda3c6..efd1adefe2 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 @@ -130,8 +130,9 @@ public final class CcCommon { Iterable<String> ourLinkopts = ruleContext.attributes().get("linkopts", Type.STRING_LIST); List<String> result; if (ourLinkopts != null) { - boolean allowDashStatic = !cppConfiguration.forceIgnoreDashStatic() - && (cppConfiguration.getDynamicMode() != DynamicMode.FULLY); + boolean allowDashStatic = + !cppConfiguration.forceIgnoreDashStatic() + && (CppHelper.getDynamicMode(cppConfiguration, ccToolchain) != DynamicMode.FULLY); if (!allowDashStatic) { ourLinkopts = Iterables.filter(ourLinkopts, (v) -> !"-static".equals(v)); } |