aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-09-23 15:22:44 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2016-09-23 15:50:20 +0000
commit78b9cab45de2a32158cd4306cd40208045cf6f85 (patch)
tree545779a1647799548cc93e78aab5b170bb622afc /src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
parenta02b2767ce275b152ed647974e1dc074d0ad3007 (diff)
Don't use link action feature configuration in LTO Backend command line
The link action feature configuration command line options aren't needed in the LTO Backend compile command line. This additionally causes a failure when trying to compile ThinLTO and FDO, as the build variables for the FDO link options in the feature configuration are not set. Confirmed that this is a no-op for non-FDO builds (there are no c++-link* features), which is probably why I didn't notice this and remove it earlier. We add the lto-backend features later in LTOBackendArtifacts.scheduleLTOBackendAction() -- MOS_MIGRATED_REVID=134076174
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java1
1 files changed, 0 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 ad34044e68..f0ca362f9a 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
@@ -674,7 +674,6 @@ public class CppLinkActionBuilder {
for (LTOBackendArtifacts a : allLTOArtifacts) {
List<String> argv = new ArrayList<>();
argv.addAll(cppConfiguration.getLinkOptions());
- argv.addAll(featureConfiguration.getCommandLine(getActionName(), Variables.EMPTY));
argv.addAll(cppConfiguration.getCompilerOptions(features));
a.setCommandLine(argv);
}