diff options
| author |  cparsons <cparsons@google.com> | 2017-05-26 19:32:14 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-05-29 14:07:34 +0200 |
| commit | d87fc98694b846f39e8c37541fa52bafa5daee67 (patch) | |
| tree | d08cd4efb7729160e384bfce2a18be5d18c70727 /src | |
| parent | 2c3b89673232661c1645f568e806a0c0dc7af012 (diff) | |
Propagate objc_library SDK Frameworks through cc_library edges
RELNOTES: None.
PiperOrigin-RevId: 157235505
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryCcLinkParamsStore.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryCcLinkParamsStore.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryCcLinkParamsStore.java index 7b9a81499f..d0d46b08e9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryCcLinkParamsStore.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryCcLinkParamsStore.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.rules.objc; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.rules.cpp.ArtifactCategory; @@ -50,9 +51,11 @@ class ObjcLibraryCcLinkParamsStore extends CcLinkParamsStore { library, ArtifactCategory.STATIC_LIBRARY, FileSystemUtils.removeExtension(library.getRootRelativePathString()))); } - libraries.addAll(objcProvider.get(ObjcProvider.CC_LIBRARY)); - builder.addLibraries(libraries.build()); + + for (SdkFramework sdkFramework : objcProvider.get(ObjcProvider.SDK_FRAMEWORK)) { + builder.addLinkOpts(ImmutableList.of("-framework", sdkFramework.getName())); + } } }
\ No newline at end of file |