Skip to content

Commit 423c03e

Browse files
committed
Clean up rpaths of installed sourcekit-lsp
- Don’t explicitly add rpaths to `/usr/lib/swift`, `@executable_path/../lib/swift/macosx` and `@executable_path/../lib/swift-5.5/macosx` on Darwin. I don’t know what they were needed for but they don’t seem to be necessary. Also standard Swift command line tools created from Xcode don’t contain these rpaths. rdar://121400644
1 parent a9242f8 commit 423c03e

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

Utilities/build-script-helper.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,7 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace) -> List[str]:
109109

110110
build_target = get_build_target(swift_exec, args, cross_compile=(True if args.cross_compile_config else False))
111111
build_os = build_target.split('-')[2]
112-
if build_os.startswith('macosx'):
113-
swiftpm_args += [
114-
'-Xlinker', '-rpath', '-Xlinker', '/usr/lib/swift',
115-
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/../lib/swift/macosx',
116-
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/../lib/swift-5.5/macosx',
117-
]
118-
else:
112+
if not build_os.startswith('macosx'):
119113
swiftpm_args += [
120114
# Dispatch headers
121115
'-Xcxx', '-I', '-Xcxx',

0 commit comments

Comments
 (0)