Skip to content

Commit

Permalink
Remove @executable_path/Frameworks from rpaths
Browse files Browse the repository at this point in the history 
This is automatically added for these rule types by rules_apple. Having
them here causes an issue with Xcode 10.2 and above because the
/usr/bin/swift rpath _must_ be first, but this one is added first
instead.

Closes #7830.

PiperOrigin-RevId: 240806623
  • Loading branch information
@keith @copybara-github
keith authored and copybara-github committed Mar 28, 2019
1 parent 5adcd3e commit 0020a97
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 137 deletions.
80 changes: 0 additions & 80 deletions src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -373,10 +369,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -437,10 +429,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -501,10 +489,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -565,10 +549,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -629,10 +609,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -693,10 +669,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -757,10 +729,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -821,10 +789,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -885,10 +849,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -953,10 +913,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1018,10 +974,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1083,10 +1035,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1148,10 +1096,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1213,10 +1157,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1278,10 +1218,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1343,10 +1279,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1408,10 +1340,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1473,10 +1401,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1538,10 +1462,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ protected void verifyLinkAction(
.add(frameworkDir(ApplePlatform.forTarget(PlatformType.IOS, arch)))
.addAll(frameworkPathFragmentParents.build())
.add("-Xlinker -objc_abi_version -Xlinker 2")
.add("-Xlinker -rpath -Xlinker @executable_path/Frameworks")
.add("-fobjc-link-runtime")
.add("-ObjC")
.addAll(
Expand Down
56 changes: 0 additions & 56 deletions tools/osx/crosstool/cc_toolchain_config.bzl.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,10 +602,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -669,10 +665,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -735,10 +727,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -801,10 +789,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -867,10 +851,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -934,10 +914,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1003,10 +979,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1898,10 +1870,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -1969,10 +1937,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -2039,10 +2003,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -2109,10 +2069,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -2179,10 +2135,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -2250,10 +2202,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down Expand Up @@ -2323,10 +2271,6 @@ def _impl(ctx):
"-objc_abi_version",
"-Xlinker",
"2",
"-Xlinker",
"-rpath",
"-Xlinker",
"@executable_path/Frameworks",
"-fobjc-link-runtime",
"-ObjC",
],
Expand Down

0 comments on commit 0020a97

Please sign in to comment.