-
Notifications
You must be signed in to change notification settings - Fork 1.2k
plutil: Add a specific rpath for plutil and use it when linking. #2307
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
@swift-ci test |
@swift-ci test macos |
@swift-ci test macos |
-L${CMAKE_CURRENT_BINARY_DIR} | ||
-L;${FOUNDATION_PATH_TO_LIBDISPATCH_BUILD}/src |
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 may add an empty /src
to the library search path. @millenomi - is building Foundation with Dispatch something which is desired?
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.
${FOUNDATION_PATH_TO_LIBDISPATCH_BUILD}/src
was in the libdispatch_ldflags
as a RUNPATH
, so this is still needed for the link to succeed, but the RUNPATH
itself isnt.
Please test with following pull request: @swift-ci please test |
Please test with following pull request: @swift-ci please test macos |
3 similar comments
Please test with following pull request: @swift-ci please test macos |
Please test with following pull request: @swift-ci please test macos |
Please test with following pull request: @swift-ci please test macos |
I'm really not sure we should ship RPATHs in final executables. @jrose-apple how does the rest of the setup deal with dependencies? |
:-/ I think this is the right answer on Linux where we don't have an equivalent of Mach-O's |
( Alternately, static-link all the things, but that's not a good answer either. |
Please test with following pull request: @swift-ci please test macos |
Please test with following pull request: @swift-ci please test |
I don't think the cross-PR testing supports multiple PRs from the same repo. :-( |
Yeah, I wanted to test swiftlang/swift-integration-tests#58 as it looks like tests can't be run directly in the |
@millenomi We still need to add Other binaries ship with even worse paths, here is
The only two ways I can think of to clean this up would be
|
That option is coming in swiftlang/swift#24787, by the way, though it isn't hooked up to Linux yet. (I haven't landed it because it's immediately going to cause merge conflicts with the Apple-internal branches and I need to be ready to resolve them.) |
That |
- plutil requires an rpath of '$ORIGIN/../lib/swift/${swift_os}' so set this specificaly for plutil. - Add a test for running plutil, which relies on LD_LIBRARY_PATH being set when the tests are run to point to the build directories.
bd445ee
to
c76eb37
Compare
@swift-ci test linux |
Please test with following pull request: @swift-ci please test |
@swift-ci test linux |
This breaks the android build! https://dev.azure.com/compnerd/windows-swift/_build/results?buildId=3584&view=logs&j=d925d346-119b-5290-d4d9-80cb246f632e |
I don't know what's the configuration of the Linux CI machines, and if it is easy to change them, but if |
Ive unistalled the |
plutil requires an rpath of '$ORIGIN/../lib/swift/${swift_os}'
so set this specificaly for plutil.
Add a test for running plutil, which relies on LD_LIBRARY_PATH
being set when the tests are run to point to the build directories.