[5.4][CMake] fix runpath for ELF platforms #321
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove the absolute path to the host toolchain's stdlib from libXCTest.so.
|
Ping @compnerd, mind approving this too? |
|
@briancroom, this makes sure 5.4 doesn't regress from 5.3, please review and merge. |
|
@swift-ci please test |
|
Linux CI failure is unrelated to this pull. |
|
Ping, another linux CI run and this can be merged. |
|
@swift-ci smoke test linux platform |
|
@swift-ci please test |
|
@briancroom, this is ready to merge, think we can get it in before the 5.4 release? It's already in the 5.3 branch without a problem. |
|
Yes, let's get this merged. It looks like the checks are in a bit of a confused state, so I'll go ahead and merge it manually. |
|
Looks like the release branch isn't configured to allow a direct push from me, actually. @shahmishal, can you help us merge this PR? |
briancroom
approved these changes
Mar 12, 2021
|
@briancroom Branch requirements updated |
|
Thank you! |
|
Thanks all. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove the absolute path to the host toolchain's stdlib from libXCTest.so.
This is a cherry-pick of #303, which was just approved for trunk and already merged for the 5.3 branch in #308.
Only affects the rpath on ELF platforms, removing a path that is unused.
Resolves point 2. in SR-1650
None, this should be completely safe for the 5.4 branch, as it's just removing the build toolchain's stdlib rpath, which should be unused by this library.
This is in the 5.3 branch and the other corelibs had similar pulls merged before the 5.3 release and have had no complaints.
I discussed these rpath issues in detail across the entire toolchain with @gottesmm and @compnerd.