From 6140817ad14fbc2a80c9f6e8556657d5156fb1b1 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Tue, 14 Mar 2017 14:57:53 +0000 Subject: apple_binary scopes link artifacts using child configuration for --experimental_objc_crosstool=all -- PiperOrigin-RevId: 150066766 MOS_MIGRATED_REVID=150066766 --- .../java/com/google/devtools/build/lib/rules/cpp/CppModel.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java') 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 3d27459a85..bca504c0cf 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 @@ -957,8 +957,9 @@ public final class CppModel { */ private Artifact getLinkedArtifact(LinkTargetType linkTargetType) throws RuleErrorException { Artifact result = null; - Artifact linuxDefault = CppHelper.getLinuxLinkedArtifact( - ruleContext, linkTargetType, linkedArtifactNameSuffix); + Artifact linuxDefault = + CppHelper.getLinuxLinkedArtifact( + ruleContext, configuration, linkTargetType, linkedArtifactNameSuffix); try { String maybePicName = ruleContext.getLabel().getName() + linkedArtifactNameSuffix; @@ -1117,7 +1118,10 @@ public final class CppModel { if (cppConfiguration.useInterfaceSharedObjects() && allowInterfaceSharedObjects) { soInterface = CppHelper.getLinuxLinkedArtifact( - ruleContext, LinkTargetType.INTERFACE_DYNAMIC_LIBRARY, linkedArtifactNameSuffix); + ruleContext, + configuration, + LinkTargetType.INTERFACE_DYNAMIC_LIBRARY, + linkedArtifactNameSuffix); sonameLinkopts = ImmutableList.of("-Wl,-soname=" + SolibSymlinkAction.getDynamicLibrarySoname(soImpl.getRootRelativePath(), false)); } -- cgit v1.2.3