Initialize Swift Build with a toolchain-based developer directory #8464
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
owenv
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
xedin,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
MaxDesiatov
reviewed
Apr 8, 2025
MaxDesiatov
reviewed
Apr 8, 2025
jakepetroules
requested changes
Apr 9, 2025
| @@ -265,7 +266,11 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem { | |||
| ) | |||
|
|
|||
| do { | |||
| try await withSession(service: service, name: self.buildParameters.pifManifest.pathString, packageManagerResourcesDirectory: self.packageManagerResourcesDirectory) { session, _ in | |||
| let toolchainPath = self.buildParameters.toolchain.swiftCompilerPath | |||
There was a problem hiding this comment.
I think the toolchain base path should also be part of the Toolchain protocol itself rather than expanded here in SwiftBuildSystem.
Also because on some platforms it's usr/local/bin instead of usr/local, so I'd rather that logic be kept In UserToolchain itself.
There was a problem hiding this comment.
There's not an obvious way to add that requirement right now because the SwiftPM-level toolchain type conflates toolchains, SDKs, and cross compilation bundles
owenv
force-pushed
the
owenv/init-swift-toolchain
branch
from
7bd0ecd to
99f53dc
Compare
|
@swift-ci test |
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.
This allows us to correctly construct the stack of toolchains used for tool/library lookup internally, fixing builds of test targets (among other things).
Depends on swiftlang/swift-build#385