Skip to content

On ELF platforms, remove the host toolchain rpath from sourcekit-lsp before installing #417

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

Merged
merged 1 commit into from
Jul 19, 2021

Conversation

finagolfin
Copy link
Member

Without this pull, I see this in the latest official trunk snapshot build:

> readelf -d swift-DEVELOPMENT-SNAPSHOT-2021-07-15-a-centos8/usr/bin/sourcekit-lsp | ag runpath
 0x000000000000001d (RUNPATH)            Library runpath: [/home/build-user/swift-nightly-install/usr/lib/swift/linux:$ORIGIN:$ORIGIN/../lib/swift/linux]

I've been removing these host /home/build-user/ CI paths from the linux toolchain component by component, eg swiftlang/swift-package-manager#2703, this is the last remaining piece. No need to check if it's non-Darwin as in that SPM pull, as this flag does nothing on macOS.

@finagolfin finagolfin requested a review from benlangmuir as a code owner July 19, 2021 17:03
@benlangmuir
Copy link
Contributor

To clarify: after this change is the runpath $ORIGIN:$ORIGIN/../lib/swift/linux?

@benlangmuir
Copy link
Contributor

@swift-ci please test

@finagolfin
Copy link
Member Author

Yep, just those two relative rpaths after.

@benlangmuir benlangmuir merged commit 0f0647a into swiftlang:main Jul 19, 2021
@finagolfin
Copy link
Member Author

Thx, I'll submit for the 5.5 branch too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants