From 54027090564fee03bc7f710dfe37e61218fef519 Mon Sep 17 00:00:00 2001
From: plf <plf@google.com>
Date: Wed, 7 Mar 2018 02:34:04 -0800
Subject: C++: Makes sure ltoBitcodeFiles get merged when merging compilation
 outputs.

RELNOTES:
PiperOrigin-RevId: 188149648
---
 .../google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

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