Commit 788801a 1 parent aa2407f commit 788801a Copy full SHA for 788801a
File tree 1 file changed +6
-3
lines changed
src/main/java/com/google/devtools/build/lib/rules/cpp
1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -346,6 +346,10 @@ private ImmutableList<Artifact> getBuiltinIncludeFiles() {
346
346
return result .build ();
347
347
}
348
348
349
+ private boolean shouldParseShowIncludes () {
350
+ return featureConfiguration .isEnabled (CppRuleClasses .PARSE_SHOWINCLUDES );
351
+ }
352
+
349
353
/**
350
354
* Returns the list of mandatory inputs for the {@link CppCompileAction} as configured.
351
355
*/
@@ -361,7 +365,7 @@ NestedSet<Artifact> buildMandatoryInputs() {
361
365
if (grepIncludes != null ) {
362
366
realMandatoryInputsBuilder .add (grepIncludes );
363
367
}
364
- if (!shouldScanIncludes && dotdFile == null ) {
368
+ if (!shouldScanIncludes && dotdFile == null && ! shouldParseShowIncludes () ) {
365
369
realMandatoryInputsBuilder .addTransitive (ccCompilationContext .getDeclaredIncludeSrcs ());
366
370
realMandatoryInputsBuilder .addTransitive (additionalPrunableHeaders );
367
371
}
@@ -482,8 +486,7 @@ public boolean useDotdFile(Artifact sourceFile) {
482
486
}
483
487
484
488
public boolean dotdFilesEnabled () {
485
- return cppSemantics .needsDotdInputPruning (configuration )
486
- && !featureConfiguration .isEnabled (CppRuleClasses .PARSE_SHOWINCLUDES );
489
+ return cppSemantics .needsDotdInputPruning (configuration ) && !shouldParseShowIncludes ();
487
490
}
488
491
489
492
public boolean serializedDiagnosticsFilesEnabled () {
You can’t perform that action at this time.
0 commit comments