Skip to content

Use the unversioned subdirectory in the rpath. #1980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3405691582 merged 1 commit into from
Nov 11, 2025
Merged

Use the unversioned subdirectory in the rpath. #1980

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use the unversioned subdirectory in the rpath. 
While we use versioned subdirectory triples for Swift module paths, this
part of the rpath should be unversioned, if at the very least, for
consistency.

While we are here, ensure that -z origin is used when linking, which is
necessary for ORIGIN processing.
  • Loading branch information
@3405691582
3405691582 committed Sep 13, 2025
commit 4eb3f2d3fa5b3dc9574d6163602a55f1629c0dcb
5 changes: 5 additions & 0 deletions Utilities/build-script-helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ def get_swiftpm_options(args):
swiftpm_args += [
'-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/freebsd',
]
elif '-openbsd' in args.build_target:
swiftpm_args += [
'-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/openbsd',
'-Xlinker', '-z', '-Xlinker', 'origin',
]
else:
# Library rpath for swift, dispatch, Foundation, etc. when installing
swiftpm_args += [
Expand Down