On ELF platforms, only add runpaths as needed #6321
Merged
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.
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.It has always bothered me that since I suggested this hack of adding this second runpath for the Package libraries a couple years ago, all installed ELF binaries incorrectly have both runpaths:
This adds the single correct relative runpath to each, in such a way so that it is only done when installing on the CI, as @ahoppen suggested in swiftlang/sourcekit-lsp#715 and including his recommendation of removing regexes.
As noted there, this also speeds up the SPM build. I tested this natively on Android AArch64 without a problem.
I considered moving the macOS rpath flags to the package manifest too, then found that it may install all the SPM libraries (I'm assuming those flags are for macOS), so left that as a command-line flag applied to all libraries.