Update wasmkit toolchain build to emit universal binary on macOS to fix #82390 #82393
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
…tlang#82390 [platform_args] has platform variants of SwiftPM wasmkit build command: - unchanged: non-macOS + set_installation_rpath -> rpath config - added: macOS -> universal binaries using --arch side effect ok?: binary path changes are captured by '--show-bin-path'
wti
requested review from
etcwilde,
justice-adams-apple and
shahmishal
as code owners
|
@swift-ci please build toolchain |
kateinoigakukun
approved these changes
Jun 22, 2025
|
I verified the built toolchain now contains a universal binary with x86_64 and arm64. |
|
@swift-ci please smoke test |
|
@wti would you mind adding a test for this in https://github.com/swiftlang/swift-integration-tests? |
|
@MaxDesiatov I'm investigating integration tests |
|
@MaxDesiatov Please see PR swiftlang/swift-integration-tests#163 |
MaxDesiatov
pushed a commit
that referenced
this pull request
Jun 26, 2025
…#82390 (#82406) - **Explanation**: Build wasmkit, a new toolchain executable, as universal binary on macOS using SwiftPM --arch flags. (Cherry picked from commit 6530236) - **Scope**: WasmKit is new, and users targeting Wasm (and preferring WasmKit over other Wasm runtimes) might be few. WasmKit can be invoked directly by users and indirectly via `swift run` when using the official Swift SDKs for Wasm. - **Issues**: Resolves #82390 - **Original PRs**: #82393 - **Risk**: The new configuration only affects macOS targets. The binary is output to a new location, but the code already introspects the location correctly. The bug and fix impacts users of WasmKit binary newly added to toolchain, directly and via `swift run`. Risk of no-fix: The Swift.org wasm "Getting Started" [1] refers explicitly to this (unreleased) 6.2 toolchain WasmKit binary. Without this fix, users on Apple Silicon following those instructions get an obscure "bad CPU" error because it is built only for the host x86_64 arch. - **Testing**: @kateinoigakukun verified WasmKit is universal after change in `main`. To verify, run shell `file usr/bin/wasmkit` and verify outputs include x86_64 and arm64 arch. An outstanding question is whether to add a check that toolchain executables are universal binaries on macOS. Currently they are, except for `docc`. - **Reviewers**: @kateinoigakukun [1] https://www.swift.org/documentation/articles/wasm-getting-started.html
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.
Resolves #82390
(Pedantically...)
Problem: wasmkit binary in toolchain build since 5/15/25 targets host platform only
Solution: build wasmkit for macOS as a universal binary (for x86 and Apple silicon)
Validation: Untested when PR opened; please see later comments
Delivery: also hoist to
release/6.2branch for wasm-capable toolchain buildsSolution details:
wasmkit.pyrun_swift_build()already configures rpath_args per platform and configrpath_argstoplatform_args--arch ..for x86 & arm64Solution effects:
Validation:
Related work: