1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java
index b3b293bfb1..4b0980f5d6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompilationContext.java
@@ -23,7 +23,6 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.MiddlemanFactory;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
-import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -31,7 +30,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.vfs.PathFragment;
-
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Objects;
@@ -663,13 +661,17 @@ public final class CppCompilationContext implements TransitiveInfoProvider {
     public Builder addCompilationPrerequisites(Iterable<Artifact> prerequisites) {
       // LIPO collector must not add compilation prerequisites in order to avoid
       // the creation of a middleman action.
+      for (Artifact prerequisite : prerequisites) {
+        Preconditions.checkArgument(!Link.OBJECT_FILETYPES.matches(prerequisite.getFilename()));
+      }
       Iterables.addAll(compilationPrerequisites, prerequisites);
       return this;
     }
 
     /**
      * Add a single include directory to be added with "-I". It can be either
-     * relative to the exec root (see {@link BuildConfiguration#getExecRoot}) or
+     * relative to the exec root (see
+     * {@link com.google.devtools.build.lib.analysis.BlazeDirectories#getExecRoot}) or
      * absolute. Before it is stored, the include directory is normalized.
      */
     public Builder addIncludeDir(PathFragment includeDir) {
@@ -680,8 +682,8 @@ public final class CppCompilationContext implements TransitiveInfoProvider {
     /**
      * Add multiple include directories to be added with "-I". These can be
      * either relative to the exec root (see {@link
-     * BuildConfiguration#getExecRoot}) or absolute. The entries are normalized
-     * before they are stored.
+     * com.google.devtools.build.lib.analysis.BlazeDirectories#getExecRoot}) or absolute. The
+     * entries are normalized before they are stored.
      */
     public Builder addIncludeDirs(Iterable<PathFragment> includeDirs) {
       for (PathFragment includeDir : includeDirs) {
@@ -693,8 +695,8 @@ public final class CppCompilationContext implements TransitiveInfoProvider {
     /**
      * Add a single include directory to be added with "-iquote". It can be
      * either relative to the exec root (see {@link
-     * BuildConfiguration#getExecRoot}) or absolute. Before it is stored, the
-     * include directory is normalized.
+     * com.google.devtools.build.lib.analysis.BlazeDirectories#getExecRoot}) or absolute. Before it
+     * is stored, the include directory is normalized.
      */
     public Builder addQuoteIncludeDir(PathFragment quoteIncludeDir) {
       quoteIncludeDirs.add(quoteIncludeDir.normalize());
@@ -704,8 +706,8 @@ public final class CppCompilationContext implements TransitiveInfoProvider {
     /**
      * Add a single include directory to be added with "-isystem". It can be
      * either relative to the exec root (see {@link
-     * BuildConfiguration#getExecRoot}) or absolute. Before it is stored, the
-     * include directory is normalized.
+     * com.google.devtools.build.lib.analysis.BlazeDirectories#getExecRoot}) or absolute. Before it
+     * is stored, the include directory is normalized.
      */
     public Builder addSystemIncludeDir(PathFragment systemIncludeDir) {
       systemIncludeDirs.add(systemIncludeDir.normalize());