Skip to content

Use WasmKit by default for Wasm triples in toolsets #8668

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.

Sign up for GitHub

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 5 commits into from
May 15, 2025
Merged

Use WasmKit by default for Wasm triples in toolsets #8668

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65f942e
Pass `hostToolchainBinDir` to `SwiftSDKBundleStore`
MaxDesiatov May 14, 2025
238eb14
Use WasmKit by default for Wasm triples in toolsets
MaxDesiatov May 14, 2025
c3f31d0
Look up WasmKit in the host toolchain directory
MaxDesiatov May 14, 2025
8728502
Merge branch 'main' of github.com:swiftlang/swift-package-manager int…
MaxDesiatov May 14, 2025
187ab6c
Fix merge error
MaxDesiatov May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix merge error
  • Loading branch information
@MaxDesiatov
MaxDesiatov committed May 14, 2025
commit 187ab6cafd661dfc0ba1236813e680b2f91d2fcc
8 changes: 3 additions & 5 deletions Tests/PackageModelTests/SwiftSDKBundleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ final class SwiftSDKBundleTests: XCTestCase {
// With a target SDK selector, SDK should be chosen from the store.
XCTAssertEqual(targetSwiftSDK.targetTriple, targetTriple)
// No toolset in the SDK, so it should be the same as the host SDK.
XCTAssertEqual(targetSwiftSDK.toolset.rootPaths, [hostToolchainBinDir] + hostSwiftSDK.toolset.rootPaths)
XCTAssertEqual(targetSwiftSDK.toolset.rootPaths, hostSwiftSDK.toolset.rootPaths)
}

do {
Expand All @@ -472,10 +472,7 @@ final class SwiftSDKBundleTests: XCTestCase {
fileSystem: fileSystem
)
// With toolset in the target SDK, it should contain the host toolset roots at the end.
XCTAssertEqual(
targetSwiftSDK.toolset.rootPaths,
[toolsetRootPath, hostToolchainBinDir] + hostSwiftSDK.toolset.rootPaths
)
XCTAssertEqual(targetSwiftSDK.toolset.rootPaths, [toolsetRootPath] + hostSwiftSDK.toolset.rootPaths)
}

do {
Expand Down Expand Up @@ -527,6 +524,7 @@ final class SwiftSDKBundleTests: XCTestCase {
var output = [SwiftSDKBundleStore.Output]()
let store = SwiftSDKBundleStore(
swiftSDKsDirectory: swiftSDKsDirectory,
hostToolchainBinDir: "/tmp",
fileSystem: fileSystem,
observabilityScope: system.topScope,
outputHandler: { output.append($0) }
Expand Down