diff options
author | 2018-07-31 00:44:11 -0700 | |
---|---|---|
committer | 2018-07-31 00:45:36 -0700 | |
commit | e03a1190184b387f6b952085da371a6c38a6212d (patch) | |
tree | 0b81b6e96181eff226d6109cdac0d26fdd3ac2c7 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
parent | 2829ba4daad00fe9a389e2f85a62c45dd1cd6d41 (diff) |
Disable include scanning for C++ linkstamp compile actions, which are supposed to be shared.
Note that CppCompileAction#discoversInputs() will still almost always return true because it's still set to true when .d file pruning is enabled.
RELNOTES: None.
PiperOrigin-RevId: 206716704
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | 6 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java | 1 |
2 files changed, 2 insertions, 5 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 11c0565188..8c181ec7e4 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 @@ -131,9 +131,6 @@ public class CppCompileAction extends AbstractAction */ private final UUID actionClassId; - /** Whether this action needs to discover inputs. */ - private final boolean discoversInputs; - private final ImmutableList<PathFragment> builtInIncludeDirectories; /** @@ -275,7 +272,6 @@ public class CppCompileAction extends AbstractAction this.needsIncludeValidation = cppSemantics.needsIncludeValidation(); this.includeProcessing = cppSemantics.getIncludeProcessing(); this.actionClassId = actionClassId; - this.discoversInputs = shouldScanIncludes || cppSemantics.needsDotdInputPruning(); this.builtInIncludeDirectories = ImmutableList.copyOf(cppProvider.getBuiltInIncludeDirectories()); this.additionalInputs = null; @@ -346,7 +342,7 @@ public class CppCompileAction extends AbstractAction @Override public boolean discoversInputs() { - return discoversInputs; + return shouldScanIncludes || needsDotdInputPruning; } @Override diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java index e989097ddd..2fef020666 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java @@ -75,6 +75,7 @@ public class CppLinkstampCompileHelper { .setBuiltinIncludeFiles(buildInfoHeaderArtifacts) .addMandatoryInputs(nonCodeInputs) .setCppConfiguration(cppConfiguration) + .setShouldScanIncludes(false) .setActionName(CppActionNames.LINKSTAMP_COMPILE); semantics.finalizeCompileActionBuilder(ruleContext, builder); return builder.buildOrThrowIllegalStateException(); |