diff options
author | Googler <noreply@google.com> | 2016-08-24 06:28:36 +0000 |
---|---|---|
committer | John Cater <jcater@google.com> | 2016-08-24 19:59:55 +0000 |
commit | 718104d01a627fd92899be7c89ff420c5587d265 (patch) | |
tree | e9592b019989e02f2150526e7e32ff8bc94b9679 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 9eec15a34a5a3ef466c0a84f25775f688abbf7b6 (diff) |
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
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/CcBinary.java | 3 |
1 files changed, 3 insertions, 0 deletions
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(); } |