[5.9] On ELF platforms, only add runpaths as needed (#6321)#6409
Merged
Conversation
As long as I'm modifying the Python bootstrap script, clean up some incorrect checks of the host `platform.system()` and replace some unnecessary regexes.
finagolfin
requested review from
abertelrud,
neonichu and
tomerd
as code owners
Contributor
|
@swift-ci please smoke test |
tomerd
approved these changes
Apr 11, 2023
Member
Author
|
Windows CI failure when testing Foundation is unrelated. |
Contributor
|
Right, Windows doesn't even use bootstrap, so this PR should be a no op there. @tomerd could you force merge this? |
Member
Author
|
Thanks for the quick review. @tomerd, should I submit for 5.8 also? |
Contributor
|
sure, but it will have to wait until the next release |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Cherrypick of #6321
Explanation: The bootstrap script currently adds two relative runpaths for ELF platforms, one for the PackageDescription and other libraries and another for the single
swift-packageexecutable, but since they're applied on the command line, both runpaths are applied to all binaries. This pull separates out the runpaths and only applies each where needed. It also shifts much of the bootstrap script over to applying build flags based on the build target, not on checking the build host platform in Python.Scope: Should only affect the SPM build on ELF platforms like linux
Issue: None
Risk: low, as it only affects building SPM for ELF platforms
Testing: Passed all CI, including a trunk toolchain build that worked well
Reviewer: @neonichu