diff options
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java index 11a09dba8f..3f46bbdeba 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java @@ -320,9 +320,7 @@ public class CppCompileActionBuilder { // finalizeCompileActionBuilder on this builder. Preconditions.checkNotNull(shouldScanIncludes); Preconditions.checkNotNull(featureConfiguration); - boolean useHeaderModules = - allowUsingHeaderModules - && featureConfiguration.isEnabled(CppRuleClasses.USE_HEADER_MODULES); + boolean useHeaderModules = useHeaderModules(); if (featureConfiguration.actionIsConfigured(getActionName())) { for (String executionRequirement : @@ -473,7 +471,10 @@ public class CppCompileActionBuilder { private boolean useHeaderModules() { return allowUsingHeaderModules - && featureConfiguration.isEnabled(CppRuleClasses.USE_HEADER_MODULES); + && featureConfiguration.isEnabled(CppRuleClasses.USE_HEADER_MODULES) + && (sourceFile.isFileType(CppFileTypes.CPP_SOURCE) + || sourceFile.isFileType(CppFileTypes.CPP_HEADER) + || sourceFile.isFileType(CppFileTypes.CPP_MODULE_MAP)); } private boolean shouldPruneModules() { |