diff options
| author |  Googler <noreply@google.com> | 2017-10-02 17:02:56 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-10-06 19:41:47 +0200 |
| commit | aba77dd493e73079d7b9a5c0c049b405fd0a6c69 (patch) | |
| tree | e102c3b13e5de159f5c818798e233c1f0d0cbd54 /src/main/java/com/google | |
| parent | 0ebb3e54fc890946ae6b3d059ecbd50e4b5ec840 (diff) | |
Put feature arguments after command line options for LTOBackendAction
For consistency with compile actions.
RELNOTES: None
PiperOrigin-RevId: 170702636
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java index 3a09d3ab60..a7d59da23d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java @@ -159,10 +159,11 @@ public final class LtoBackendArtifacts { "per_object_debug_info_file", dwoFile.getExecPathString()); } - Variables buildVariables = buildVariablesBuilder.build(); List<String> execArgs = new ArrayList<>(); - execArgs.addAll(featureConfiguration.getCommandLine("lto-backend", buildVariables)); execArgs.addAll(commandLine); + Variables buildVariables = buildVariablesBuilder.build(); + // Feature options should go after --copt for consistency with compile actions. + execArgs.addAll(featureConfiguration.getCommandLine("lto-backend", buildVariables)); // If this is a PIC compile (set based on the CppConfiguration), the PIC // option should be added after the rest of the command line so that it // cannot be overridden. This is consistent with the ordering in the |