-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Add swiftpm-xctest-helper rpath on macOS. #2694
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
Conversation
Add an extra rpath for swiftpm-xctest-helper on macOS: `@executable_path/../../../lib/swift/macosx`. This should fix `swift test --filter ...`.
c149be1
to
500c273
Compare
@swift-ci Please smoke test |
This PR did not fix SR-12599 or SR-12600, so I'm converting it back to a draft.
@abertelrud: I wonder if you have any ideas why this PR didn't work? |
Thanks for taking the time to try this fix, and apologies for not replying until now. I don't know offhand why your diff doesn't work, but I'll take a look and see what I can find. Otherwise, we could take the fix that adds the rpath to all of them, but as I'm also looking into a similar issue, I'd like to take a stab at figuring out how to do more targeted rpaths. BTW, I am just now learning CMake myself, so I will need to explore a bit. |
Hi @abertelrud, I wonder if you have any updates regarding this PR or #2692, as a fix for the Thanks! |
Hi, apologies for the delay. I've taken a look at this now, and am seeing the same as you. In fact, it doesn't look as if CMake is being used for building |
Looking closer at the log, it looks as if the If so, the right place for these flags would be in the SwiftPM package manifest itself. |
Something like this seems to work:
I have confirmed that this results in the right rpath in the produced binary, but I am not sure whether that is the right way to do it, and whether there would be any unwanted side effects. @aciidb0mb3r or @neonichu, what do you think? |
This should be ok for now since we don't export |
I confirmed that #2694 (comment) works as a fix for SR-12600. I made it into a PR: #2785. |
Add an extra rpath for swiftpm-xctest-helper on macOS:
@executable_path/../../../lib/swift/macosx
.This should fix SR-12599 and SR-12600, not yet verified:
Building Swift toolchains now to verify the fix.
Edit: this patch doesn't fix the issues in its current form.
This idea was suggested by @abertelrud in #2692 (comment) as a more focused fix for SR-12599 and SR-12600.