diff options
author | Googler <noreply@google.com> | 2016-10-27 08:16:38 +0000 |
---|---|---|
committer | Laszlo Csomor <laszlocsomor@google.com> | 2016-10-27 09:28:07 +0000 |
commit | 65b9c444c70177a5d0d0818dbaa93a5f82bd41a8 (patch) | |
tree | 52ea200f039d54282f1de8e32e76bb2532bd1638 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | |
parent | 5a8d3e237f321e8ebee16183b966c968fdd8019a (diff) |
Don't let input discovery add module files as inputs if we aren't actually
building with modules.
--
MOS_MIGRATED_REVID=137368548
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 3f01369d7d..ad24a7d95a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -290,9 +290,7 @@ public class CppCompileAction extends AbstractAction ruleContext, mandatoryInputs, context.getTransitiveCompilationPrerequisites(), - featureConfiguration.isEnabled(CppRuleClasses.USE_HEADER_MODULES) - ? context.getTransitiveModules(usePic) - : null, + context.getUseHeaderModules() ? context.getTransitiveModules(usePic) : null, optionalSourceFile, lipoScannables), CollectionUtils.asListWithoutNulls( |