diff options
author | 2016-09-06 18:49:44 +0000 | |
---|---|---|
committer | 2016-09-07 10:36:46 +0000 | |
commit | 317eddb6b15ecbb53bd65bebac2b061630b69c1b (patch) | |
tree | cf0b1118e6fa621d3817273b10252e4c9dec9404 /src/main/java/com/google/devtools/build/lib | |
parent | 87463e7c4006880b6939fbc07cfb5556260c39fb (diff) |
Don't verify include paths automatically. This enables objc to disable include paths.
--
MOS_MIGRATED_REVID=132345416
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java | 2 |
2 files changed, 5 insertions, 1 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 abc54a6efd..0ad000e569 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 @@ -300,7 +300,9 @@ public class CppCompileAction extends AbstractAction this.mandatoryInputs = mandatoryInputs; this.builtinIncludeFiles = CppHelper.getToolchain(ruleContext).getBuiltinIncludeFiles(); this.semantics = semantics; - verifyIncludePaths(ruleContext); + if (semantics.needsIncludeValidation()) { + verifyIncludePaths(ruleContext); + } } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java index 798d90998b..2386724ba3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java @@ -494,6 +494,8 @@ public final class CppModel { CppCompileActionBuilder builder = initializeCompileAction(moduleMapArtifact, moduleMapLabel, /*forInterface=*/ true); + builder.setSemantics(semantics); + // A header module compile action is just like a normal compile action, but: // - the compiled source file is the module map // - it creates a header module (.pcm file). |