-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[CMake] fix plutil runpath for ELF platforms #2999
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
Conversation
@drexin, could you look at this? |
@varungandhi-apple, mind running the CI here? |
@swift-ci test |
The linux CI reports this error:
I tried running the same command with a recent official trunk snapshot build, no problem. Technically, the command doesn't need to pass that flag in through I have no idea why this wouldn't work here and the same flag works when building the full Foundation, anyone know? |
Oh, think I got it, fix incoming. |
Remove the absolute path to the host toolchain's stdlib from plutil, and add it as a CMake BUILD_PATH, so that it's removed upon installation.
Alright, had to do with string quoting. I hadn't tested adding that flag first, did so now. |
@swift-ci test |
macOS CI failure is unrelated, linux CI passing means this works. |
Ping, just needs the macOS CI run again, which this ELF pull doesn't affect, and can get this in. |
@swift-ci test macOS |
Some memory issue on the macOS CI? Again unrelated. |
OK-ed by Dario, merged. Sorry about the delay. |
Remove the absolute path to the host toolchain's stdlib from plutil, and add it as a CMake
BUILD_PATH
, so that it's removed upon installation.The problem is that plutil on linux currently has this rpath:
I submitted this as part of #2783 earlier, but had to remove it because the linux CMake was too old and didn't support
BUILD_RPATH
then. With swiftlang/swift#37517 updating the linux CMake, this should work now.