diff options
| author |  plf <plf@google.com> | 2018-01-16 06:12:56 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-16 06:15:00 -0800 |
| commit | 70538b5dfc5bc1ff84aa506f588f26ce8d4421f7 (patch) | |
| tree | d25d9b36c1689f474a061a0ee3630145d842857f /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 543e3b67616f5b3dd93d9ded725b93e8a61e40b7 (diff) | |
C++: Fixes linkstamp not compiled with PIC.
RELNOTES:none
PiperOrigin-RevId: 182044727
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java | 3 |
1 files changed, 2 insertions, 1 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 f7646c6d25..31e287a4cd 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 @@ -992,7 +992,8 @@ public class CppLinkActionBuilder { cppConfiguration, CppHelper.getFdoBuildStamp(ruleContext, fdoSupport.getFdoSupport()), featureConfiguration, - linkType == LinkTargetType.DYNAMIC_LIBRARY && toolchain.toolchainNeedsPic(), + cppConfiguration.forcePic() + || (linkType == LinkTargetType.DYNAMIC_LIBRARY && toolchain.toolchainNeedsPic()), Matcher.quoteReplacement( isNativeDeps && cppConfiguration.shareNativeDeps() ? output.getExecPathString() |