Add @loader_path/Frameworks rpath when building frameworks, as Xcode does (at least in 26.0 and later; I haven't tested earlier versions).

allevato · swiple-rules-gardener · commit 11b5037cb481 · 2026-01-06T05:39:05.000-08:00
PiperOrigin-RevId: 852737838
diff --git a/apple/internal/rule_support.bzl b/apple/internal/rule_support.bzl
@@ -212,6 +212,8 @@ _RULE_TYPE_DESCRIPTORS = {
                 # Application.app/Frameworks/Framework.framework/Framework
                 # Frameworks are packaged in Application.app/Frameworks
                 "@executable_path/Frameworks",
+                # Xcode also adds this path when building frameworks.
+                "@loader_path/Frameworks",
             ],
         ),
         # ios_imessage_application
@@ -454,6 +456,8 @@ _RULE_TYPE_DESCRIPTORS = {
                 # Application.app/Frameworks/Framework.framework/Framework
                 # Frameworks are packaged in Application.app/Frameworks
                 "@executable_path/Frameworks",
+                # Xcode also adds this path when building frameworks.
+                "@loader_path/Frameworks",
             ],
         ),
         # tvos_static_framework
@@ -522,6 +526,8 @@ _RULE_TYPE_DESCRIPTORS = {
                 # Application.app/Frameworks/Framework.framework/Framework
                 # Frameworks are packaged in Application.app/Frameworks
                 "@executable_path/Frameworks",
+                # Xcode also adds this path when building frameworks.
+                "@loader_path/Frameworks",
             ],
         ),
         # visionos_unit_test
@@ -614,6 +620,8 @@ _RULE_TYPE_DESCRIPTORS = {
                 # Application.app/Frameworks/Framework.framework/Framework
                 # Frameworks are packaged in Application.app/Frameworks
                 "@executable_path/Frameworks",
+                # Xcode also adds this path when building frameworks.
+                "@loader_path/Frameworks",
             ],
         ),
         # watchos_ui_test
diff --git a/test/starlark_tests/ios_framework_tests.bzl b/test/starlark_tests/ios_framework_tests.bzl
@@ -83,7 +83,11 @@ def ios_framework_test_suite(name):
         build_type = "simulator",
         target_under_test = "//test/starlark_tests/targets_under_test/ios:fmwk",
         binary_test_file = "$BUNDLE_ROOT/fmwk",
-        macho_load_commands_contain = ["name @rpath/fmwk.framework/fmwk (offset 24)"],
+        macho_load_commands_contain = [
+            "name @rpath/fmwk.framework/fmwk (offset 24)",
+            "path @executable_path/Frameworks (offset 12)",
+            "path @loader_path/Frameworks (offset 12)",
+        ],
         contains = [
             "$BUNDLE_ROOT/fmwk",
             "$BUNDLE_ROOT/Headers/common.h",
diff --git a/test/starlark_tests/tvos_framework_tests.bzl b/test/starlark_tests/tvos_framework_tests.bzl
@@ -101,6 +101,8 @@ def tvos_framework_test_suite(name):
         binary_test_file = "$BUNDLE_ROOT/fmwk",
         macho_load_commands_contain = [
             "name @rpath/fmwk.framework/fmwk (offset 24)",
+            "path @executable_path/Frameworks (offset 12)",
+            "path @loader_path/Frameworks (offset 12)",
         ],
         tags = [name],
     )
diff --git a/test/starlark_tests/watchos_framework_tests.bzl b/test/starlark_tests/watchos_framework_tests.bzl
@@ -90,6 +90,8 @@ def watchos_framework_test_suite(name):
         binary_test_file = "$BUNDLE_ROOT/fmwk",
         macho_load_commands_contain = [
             "name @rpath/fmwk.framework/fmwk (offset 24)",
+            "path @executable_path/Frameworks (offset 12)",
+            "path @loader_path/Frameworks (offset 12)",
         ],
         tags = [name],
     )

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ def tvos_framework_test_suite(name):`
`101`	`101`	`binary_test_file = "$BUNDLE_ROOT/fmwk",`
`102`	`102`	`macho_load_commands_contain = [`
`103`	`103`	`"name @rpath/fmwk.framework/fmwk (offset 24)",`
	`104`	`+ "path @executable_path/Frameworks (offset 12)",`
	`105`	`+ "path @loader_path/Frameworks (offset 12)",`
`104`	`106`	`],`
`105`	`107`	`tags = [name],`
`106`	`108`	`)`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,8 @@ def watchos_framework_test_suite(name):`
`90`	`90`	`binary_test_file = "$BUNDLE_ROOT/fmwk",`
`91`	`91`	`macho_load_commands_contain = [`
`92`	`92`	`"name @rpath/fmwk.framework/fmwk (offset 24)",`
	`93`	`+ "path @executable_path/Frameworks (offset 12)",`
	`94`	`+ "path @loader_path/Frameworks (offset 12)",`
`93`	`95`	`],`
`94`	`96`	`tags = [name],`
`95`	`97`	`)`