aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Cal Peyser <cpeyser@google.com>2016-08-23 14:56:33 +0000
committerGravatar John Cater <jcater@google.com>2016-08-23 22:57:27 +0000
commit63d0848819137c620dca53c4cf762ee6bb4abc3b (patch)
tree0f5c5cb76def167d239391117b6ad23d1a795ee2 /src/main
parent0943498edc05ada655cc2862a644071e503dd034 (diff)
Propagate defines through objc -> cc deps.
-- MOS_MIGRATED_REVID=131055419
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
index 0703a14b8d..0a9e3a3cc5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
@@ -253,6 +253,7 @@ public final class ObjcCommon {
addAnyProviders(cppDeps, dep, CppCompilationContext.class);
if (isCcLibrary(dep)) {
cppDepLinkParams.add(dep.getProvider(CcLinkParamsProvider.class));
+ addDefines(dep.getProvider(CppCompilationContext.class).getDefines());
}
}
addDepObjcProviders(propagatedObjcDeps.build());