diff options
| author |  hlopko <hlopko@google.com> | 2018-04-30 00:15:36 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-30 00:17:12 -0700 |
| commit | be6bd210ad8522eb637568c0249246110562051a (patch) | |
| tree | ad74e24c72085c66cc263a7952aacf671837111d /src/main/java/com/google | |
| parent | 3a292efa55075e020d60daeeb7566b7e2ea721c2 (diff) | |
Automated rollback of commit fd9a0958a989cac1f08f15ab5643728469f9824e.
RELNOTES: None.
PiperOrigin-RevId: 194746481
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index 73b8bea0d3..6662968cb3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -708,18 +708,12 @@ public class CppLinkActionBuilder { result.addAll( CppHelper.getFullyStaticLinkOptions(cppConfiguration, toolchain, sharedLinkopts)); } else if (mostlyStatic) { - if (!featureConfiguration.isEnabled(CppRuleClasses.STATIC_LINKING_MODE)) { - result.addAll( - CppHelper.getMostlyStaticLinkOptions( - cppConfiguration, - toolchain, - sharedLinkopts, - featureConfiguration.isEnabled(CppRuleClasses.STATIC_LINK_CPP_RUNTIMES))); - } + result.addAll( + CppHelper.getMostlyStaticLinkOptions( + cppConfiguration, toolchain, sharedLinkopts, + featureConfiguration.isEnabled(CppRuleClasses.STATIC_LINK_CPP_RUNTIMES))); } else { - if (!featureConfiguration.isEnabled(CppRuleClasses.DYNAMIC_LINKING_MODE)) { - result.addAll(CppHelper.getDynamicLinkOptions(cppConfiguration, toolchain, sharedLinkopts)); - } + result.addAll(CppHelper.getDynamicLinkOptions(cppConfiguration, toolchain, sharedLinkopts)); } // Extra test-specific link options. |