From 70538b5dfc5bc1ff84aa506f588f26ce8d4421f7 Mon Sep 17 00:00:00 2001
From: plf <plf@google.com>
Date: Tue, 16 Jan 2018 06:12:56 -0800
Subject: C++: Fixes linkstamp not compiled with PIC.

RELNOTES:none
PiperOrigin-RevId: 182044727
---
 .../com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

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()
-- 
cgit v1.2.3