diff options
author | 2018-03-07 02:34:04 -0800 | |
---|---|---|
committer | 2018-03-07 02:37:50 -0800 | |
commit | 54027090564fee03bc7f710dfe37e61218fef519 (patch) | |
tree | 745a2ddbd6cf7b49f8280fa9e271041b2d836fde /src/main/java/com/google/devtools/build/lib/rules | |
parent | fb9646ce1f1b90906f0dff8c038415781efaab7f (diff) |
C++: Makes sure ltoBitcodeFiles get merged when merging compilation outputs.
RELNOTES:
PiperOrigin-RevId: 188149648
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java | 1 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java index 35c02d76f7..6c6fd14230 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java @@ -783,7 +783,6 @@ public final class CcCompilationHelper { ccOutputs = new CcCompilationOutputs.Builder() .merge(ccOutputs) - .addLtoBitcodeFile(ccOutputs.getLtoBitcodeFiles()) .addObjectFiles(objectFiles) .addPicObjectFiles(picObjectFiles) .build(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java index b524ae49c8..ff1a04f1c1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java @@ -197,6 +197,7 @@ public class CcCompilationOutputs { this.temps.addTransitive(outputs.temps); this.headerTokenFiles.addAll(outputs.headerTokenFiles); this.lipoScannables.addAll(outputs.lipoScannables); + this.ltoBitcodeFiles.putAll(outputs.ltoBitcodeFiles); return this; } @@ -229,11 +230,6 @@ public class CcCompilationOutputs { return this; } - public Builder addLtoBitcodeFile(ImmutableMap<Artifact, Artifact> artifacts) { - ltoBitcodeFiles.putAll(artifacts); - return this; - } - public Builder addPicObjectFiles(Iterable<Artifact> artifacts) { for (Artifact artifact : artifacts) { Preconditions.checkArgument(Link.OBJECT_FILETYPES.matches(artifact.getFilename())); |