Pass the correct toolchain path to SwiftBuild #8696
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
jakepetroules
requested review from
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
@swift-ci test |
|
@swift-ci test windows |
owenv
reviewed
May 20, 2025
| let sessionResult = if toolchainPath.components.contains(where: { $0.hasSuffix(".xctoolchain") }) { | ||
| await service.createSession(name: name, developerPath: nil, resourceSearchPaths: packageManagerResourcesDirectory.map { [$0.pathString] } ?? [], cachePath: nil, inferiorProductsPath: nil, environment: nil) | ||
| } else { | ||
| await service.createSession(name: name, swiftToolchainPath: toolchainPath.pathString, resourceSearchPaths: packageManagerResourcesDirectory.map { [$0.pathString] } ?? [], cachePath: nil, inferiorProductsPath: nil, environment: nil) |
There was a problem hiding this comment.
I went back and forth on whether this should use the toolchain from build params or the toolchain this SwiftPM is installed in. I think I've decided I'm happy with this approach though
owenv
approved these changes
May 20, 2025
jakepetroules
commented
May 20, 2025
| try resolveSymlinks(swiftCompilerPath) | ||
| .parentDirectory // bin | ||
| .parentDirectory // usr | ||
| .parentDirectory // <toolchain> |
There was a problem hiding this comment.
This probably breaks for some platforms like FreeBSD where there's an expectation of using /usr/local but will handle that in a future change.
|
@swift-ci test windows |
|
@swift-ci test windows self hosted |
|
@swift-ci test windows |
dschaefer2
approved these changes
May 24, 2025
SwiftBuild can be initialized with either an Xcode-based developer directory for a Swift toolchain based developer directory, pass the right flags to initialize properly based on what kind of toolchain is in use.
jakepetroules
force-pushed
the
eng/PR-pass-toolchain-paths
branch
from
5d4c5d7 to
0a9566c
Compare
|
@swift-ci test |
|
@swift-ci test windows |
|
@swift-ci test windows |
jakepetroules
added a commit
that referenced
this pull request
May 28, 2025
Amendment to #8696 which computes the correct path on Windows and FreeBSD, which use different install layouts from the other platforms.
jakepetroules
added a commit
that referenced
this pull request
May 28, 2025
Amendment to #8696 which computes the correct path on Windows and FreeBSD, which use different install layouts from the other platforms.
jakepetroules
added a commit
that referenced
this pull request
May 29, 2025
Amendment to #8696 which computes the correct path on Windows and FreeBSD, which use different install layouts from the other platforms.
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.
SwiftBuild can be initialized with either an Xcode-based developer directory for a Swift toolchain based developer directory, pass the right flags to initialize properly based on what kind of toolchain is in use.