From 718104d01a627fd92899be7c89ff420c5587d265 Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 24 Aug 2016 06:28:36 +0000 Subject: Fix nocompile tests after commit b6fd4ed25b6201eaaabb14c389c02819184ad4a6. I can't say that I fully know what I am doing, but this basically reinstantiates the old behavior. Before commit b6fd4ed25b6201eaaabb14c389c02819184ad4a6, transitive modules were added in getAdditionalInputs() (by adding both topLevelHeaderModules and impliedHeaderModules). I removed that, but we still need to create the corresponding symlinks, so adding transitiveModules outside of getAdditionalInputs now. -- MOS_MIGRATED_REVID=131139735 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java index 541cd6c7a5..312f05f109 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java @@ -143,6 +143,9 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory { // Add additional files that are referenced from the compile command, like module maps // or header modules. builder.addSymlinksToArtifacts(cppCompilationContext.getAdditionalInputs()); + builder.addSymlinksToArtifacts( + cppCompilationContext.getTransitiveModules( + CppHelper.usePic(context, !isLinkShared(context)))); } return builder.build(); } -- cgit v1.2.3