Skip to content

[CMake][llbuildSwift] fix runpath for ELF platforms #670

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
May 7, 2020

Conversation

finagolfin
Copy link
Member

Remove the absolute path to the host toolchain's stdlib from libllbuildSwift.so.

Otherwise, you see the following in the latest official 5.3 snapshot release for linux:

> readelf -d swift-5.3-DEVELOPMENT-SNAPSHOT-2020-05-04-a-ubuntu18.04/usr/lib/swift/pm/llbuild/libllbuildSwift.so | ag runpath
0x000000000000001d (RUNPATH)            Library runpath: [/home/buildnode/jenkins/workspace/oss-swift-5.3-package-linux-ubuntu-18_04/build/buildbot_linux/swift-linux-x86_64/lib/swift/linux:$ORIGIN:$ORIGIN/../../linux]

Remove the absolute path to the host toolchain's stdlib from libllbuildSwift.so.
@finagolfin
Copy link
Member Author

Btw, I also just noticed this broken relative rpath in the official 5.2.3 release for linux:

> readelf -d swift-5.2.3-RELEASE-ubuntu18.04/usr/lib/swift/pm/llbuild/libllbuildSwift.so | ag runpath
0x000000000000001d (RUNPATH)            Library runpath: [/home/buildnode/jenkins/workspace/oss-swift-5.2-package-linux-ubuntu-18_04/build/buildbot_linux/swift-linux-x86_64/lib/swift/linux:$ORIGIN:$ORIGIN/../../$<LOWER_CASE:Linux>]

That may also be worth fixing separately in the 5.2 branch, though given that nobody noticed so far, maybe not.

@dmbryson
Copy link
Contributor

dmbryson commented May 7, 2020

@swift-ci please smoke test

@finagolfin
Copy link
Member Author

OS X failure looks spurious as this pull only affects linux, which passes.

@dmbryson
Copy link
Contributor

dmbryson commented May 7, 2020

@swift-ci please smoke test osx

1 similar comment
@dmbryson
Copy link
Contributor

dmbryson commented May 7, 2020

@swift-ci please smoke test osx

@dmbryson
Copy link
Contributor

dmbryson commented May 7, 2020

@swift-ci please smoke test

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