Add toolchain swift stdlib to env when swift run. #8364
Merged
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
Swift Build doesn't set the rpath of the generated executable to point at the toolchains swift standard library. We shouldn't be hardcoding those paths anyway since that restricts deployment options. Instead we point the LD_LIBRARY_PATH at swift run time to pick them up.
dschaefer2
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
xedin,
shawnhyam,
bripeticca,
plemarquand,
owenv and
bkhouri
as code owners
|
@swift-ci please test |
|
@swift-ci please test windows |
cmcgee1024
approved these changes
Mar 17, 2025
| @@ -242,11 +244,23 @@ public struct SwiftRunCommand: AsyncSwiftCommand { | |||
| arguments = options.arguments | |||
| } | |||
|
|
|||
| // For Linux, need to point LD_LIBRARY_PATH at the swift runtime | |||
| let environment: [String: String]? | |||
| if toolchain.targetTriple.isLinux() { | |||
There was a problem hiding this comment.
nit: could be if toolchain.targetTriple.objectFormat == .elf to cover other relevant platforms as well.
I guess for the platform part of the directory path you could use the OS part of the triple, though it's not guaranteed to be 1:1 for all platforms (e.g. Apple platforms, and Android)
(can also be a follow-on change)
jakepetroules
approved these changes
Mar 17, 2025
rintaro
added a commit
to rintaro/swift-package-manager
that referenced
this pull request
Mar 19, 2025
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.
Swift Build doesn't set the rpath of the generated executable to point at the toolchains swift standard library. We shouldn't be hardcoding those paths anyway since that restricts deployment options. Instead we point the LD_LIBRARY_PATH at swift run time to pick them up.