When --crosstool_compilation_support=library/all, user header search paths from

child configurations are used in compilation.

PiperOrigin-RevId: 155564865

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