[5.9][lldb][Swift][CMake] Correct RUNPATH in Linux builds #7345
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* When LLDB_BUILD_FRAMEWORK is not enabled, liblldb is built/installed in 'lib/'. Pass the correct path to 'add_properties_for_swift_modules * '$ORIGIN' instead of '@loader_path' in Linux-like platforms (cherry picked from commit 680e5ba)
|
@swift-ci Please test |
I had this looking directly in `./swift/<os>/` before, but now that an installed lldb executable also links against Swift libraries, this needs to be the more general `../lib/swift/<os>/`. (cherry picked from commit 5444a68)
|
@swift-ci Please test |
1 similar comment
|
@swift-ci Please test |
|
Just a reminder that swiftlang/swift-integration-tests#121 will need to be merged into 5.9 and 5.9.0 also, as that test checks these runpaths on linux. |
|
5.9 and 5.9.0 don't have that check in (that's why all the toolchain builds passed) |
|
Ah, you're right, I forgot that I added that test after the 5.9 branch. Ignore what I said. 🙄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry-pick #7331 and #7359 into
swift/release/5.9RUNPATHwhen building for Linux. In linux,liblldbis built/installed inlib/. Previously it was assumed to be installed in a.frameworkdirectory like in macOS. AlsoRUNPATHwas set with@loader_pathbut in Linux, equivalent is$ORIGIN. This is required for enabling Macros in Linux