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.
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
Add swiftpm-xctest-helper rpath on macOS. #2785
Conversation
Add an extra rpath for swiftpm-xctest-helper on macOS: `@executable_path/../../../lib/swift/macosx`. This fixes SR-12600: `swift test --filter`. Co-authored-by: Anders Bertelrud <anders@apple.com>
553e2c1
to
14235e6
Compare
Just triggering tests. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me, but I am not as familiar with how SwiftPM is built as some others are. Would also appreciate review by @aciidb0mb3r and @neonichu
I don't think we should be using |
Here's a PR (with more context) that edits the The change is more invasive though, adding the rpath to all tools instead of just Any suggestions would be appreciated for moving forward with this PR or that one! |
Oh, I didn't realise this change had so much history. It seems like Ankit and Anders think it is fine to do this with |
@swift-ci please smoke test |
Could someone please help merge this PR, if everything's okay? @neonichu |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Yes, I think this is preferable to adding this flag to all the binaries.
Add an extra rpath for swiftpm-xctest-helper on macOS:
@executable_path/../../../lib/swift/macosx
.This fixes SR-12600:
Fix found by @abertelrud in #2694 (comment).