diff options
author | cpeyser <cpeyser@google.com> | 2017-05-09 18:55:15 -0400 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2017-05-10 13:37:11 -0400 |
commit | 8a90a88d35ddedc071c603b8889c95a76d0ccbff (patch) | |
tree | c70c529b7c5530b2b56e0ef4a9b02c08a6a541bd /src/main/java/com | |
parent | 927e31d522f37baec06b0f77183f6f0c715e080e (diff) |
When --crosstool_compilation_support=library/all, user header search paths from
child configurations are used in compilation.
PiperOrigin-RevId: 155564865
Diffstat (limited to 'src/main/java/com')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java index bca6ccfc66..c2e1bd8530 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java @@ -111,7 +111,12 @@ public class ObjcCppSemantics implements CppSemantics { @Override public void setupCompilationContext(RuleContext ruleContext, Builder contextBuilder) { - // For objc builds, no extra setup is required. + // The genfiles root of each child configuration must be added to the compile action so that + // generated headers can be resolved. + for (PathFragment iquotePath : + ObjcCommon.userHeaderSearchPaths(objcProvider, ruleContext.getConfiguration())) { + contextBuilder.addQuoteIncludeDir(iquotePath); + } } @Override |