apple_binary scopes link artifacts using child configuration for --experimental_objc_crosstool=all

--
PiperOrigin-RevId: 150066766
MOS_MIGRATED_REVID=150066766

1 files changed, 16 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index 92df63420e..3134aad034 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -342,13 +342,23 @@ public class CppHelper {
         src.getRoot());
   }
 
-  /** Returns the linked artifact for linux. */
-  public static Artifact getLinuxLinkedArtifact(RuleContext ruleContext, LinkTargetType linkType) {
-    return getLinuxLinkedArtifact(ruleContext, linkType, "");
+  /**
+   * Returns the linked artifact for linux.
+   *
+   * @param ruleContext the ruleContext to be used to scope the artifact
+   * @param config the configuration to be used to scope the artifact
+   * @param linkType the type of artifact, used to determine extension
+   */
+  public static Artifact getLinuxLinkedArtifact(
+      RuleContext ruleContext, BuildConfiguration config, LinkTargetType linkType) {
+    return getLinuxLinkedArtifact(ruleContext, config, linkType, "");
   }
 
   /** Returns the linked artifact with the given suffix for linux. */
-  public static Artifact getLinuxLinkedArtifact(RuleContext ruleContext, LinkTargetType linkType,
+  public static Artifact getLinuxLinkedArtifact(
+      RuleContext ruleContext,
+      BuildConfiguration config,
+      LinkTargetType linkType,
       String linkedArtifactNameSuffix) {
     PathFragment name = new PathFragment(ruleContext.getLabel().getName());
     if (linkType != LinkTargetType.EXECUTABLE) {
@@ -356,7 +366,8 @@ public class CppHelper {
           "lib" + name.getBaseName() + linkedArtifactNameSuffix  + linkType.getExtension());
     }
 
-    return ruleContext.getBinArtifact(name);
+    return ruleContext.getPackageRelativeArtifact(
+        name, config.getBinDirectory(ruleContext.getRule().getRepository()));
   }
 
   /**