From b15710322fb964d087d9676fe01f8c824ab37dc3 Mon Sep 17 00:00:00 2001
From: plf <plf@google.com>
Date: Fri, 2 Feb 2018 10:44:38 -0800
Subject: C++: Stops generating DWO files when PER_OBJECT_DEBUG_INFO feature is
 not enabled.

RELNOTES:none
PiperOrigin-RevId: 184303490
---
 .../devtools/build/lib/rules/cpp/CppLinkActionBuilder.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

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 ea3e92b70a..731ac97e16 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
@@ -569,7 +569,8 @@ public class CppLinkActionBuilder {
                 toolchain,
                 fdoSupport,
                 usePicForLtoBackendActions,
-                CppHelper.useFission(cppConfiguration, toolchain),
+                CppHelper.shouldCreatePerObjectDebugInfo(
+                    cppConfiguration, toolchain, featureConfiguration),
                 argv)
             : new LtoBackendArtifacts(
                 ltoOutputRootPrefix,
@@ -582,7 +583,8 @@ public class CppLinkActionBuilder {
                 toolchain,
                 fdoSupport,
                 usePicForLtoBackendActions,
-                CppHelper.useFission(cppConfiguration, toolchain),
+                CppHelper.shouldCreatePerObjectDebugInfo(
+                    cppConfiguration, toolchain, featureConfiguration),
                 argv);
     return ltoArtifact;
   }
@@ -1646,7 +1648,8 @@ public class CppLinkActionBuilder {
       }
 
       if (getLinkType().staticness().equals(Staticness.DYNAMIC)
-          && CppHelper.useFission(cppConfiguration, toolchain)) {
+          && CppHelper.shouldCreatePerObjectDebugInfo(
+              cppConfiguration, toolchain, featureConfiguration)) {
         buildVariables.addStringVariable(IS_USING_FISSION_VARIABLE, "");
       }
 
-- 
cgit v1.2.3