Skip to content

[CMake] Tweak path separators in new Swift runpaths #68238

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
Aug 31, 2023

Conversation

finagolfin
Copy link
Member

@rintaro and @bnbarham, this is a quick tweak pull to fix the double slashes in the runpaths shown here after #68082:

> readelf -d usr/lib/swift/host/plugins/lib*so | ag "File:|runpath"
File: usr/lib/swift/host/plugins/libObservationMacros.so
 0x000000000000001d (RUNPATH)            Library runpath: [$ORIGIN/../../..//swift/linux:$ORIGIN/..]
File: usr/lib/swift/host/plugins/libSwiftMacros.so
 0x000000000000001d (RUNPATH)            Library runpath: [$ORIGIN/../../..//swift/linux:$ORIGIN/..]

@rintaro
Copy link
Member

rintaro commented Aug 31, 2023

Thank you! To clarify, this doesn't affect the actual .so path resolution, right? (i.e. we don't need this for 5.9)

@rintaro
Copy link
Member

rintaro commented Aug 31, 2023

@swift-ci Please smoke test

@finagolfin
Copy link
Member Author

this doesn't affect the actual .so path resolution, right?

Yes, this should have no functional effect, purely for looks.

@finagolfin
Copy link
Member Author

Linux CI broke because of my lldb rpath pull that was just merged, I'll update the failing integration test in a couple minutes.

@finagolfin
Copy link
Member Author

OK, hopefully linux CI will pass now.

@bnbarham
Copy link
Contributor

@swift-ci please smoke test Linux platform

@rintaro rintaro merged commit 16d7ba0 into swiftlang:main Aug 31, 2023
@finagolfin finagolfin deleted the rpath branch September 1, 2023 15:20
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.

3 participants