Start renaming preview1 to p1 and preview2 to p2 #386
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
|
I'll note that I'm opening this as a draft here because WebAssembly/wasi-libc#478 should land first. In the meantime I've updated the submodule in this PR to point at my fork of wasi-libc, which should not land in this repository (it's just here for testing in CI and showing what this will look like) |
This commit is a reflection of WebAssembly/wasi-libc#478 into this repository where a few changes are happening: * A new `wasm32-wasip1` sysroot is prepared matching `wasm32-wasi` * A new `wasm32-wasip1-threads` sysroot is prepared matching `wasm32-wasi-threads` * The `wasm32-wasi-preview2` target is renamed `wasm32-wasip2` I've done a bit of makefile refactoring to deduplicate things a bit now that there's a number of targets being built. The long-term goal would be to remove the `wasm32-wasi` and `wasm32-wasip1-threads` targets, but that's not proposed just yet at this time.
alexcrichton
force-pushed
the
start-rename-targets
branch
from
36499ca to
46a5ce1
Compare
|
With WebAssembly/wasi-libc#478 now landed I've updated this to the official submodule and this is no longer a draft. |
sunfishcode
reviewed
Mar 6, 2024
Makefile
Outdated
| # Install clang-provided headers. | ||
| cp -R $(ROOT_DIR)/build/llvm/lib/clang $(BUILD_PREFIX)/lib/ | ||
| cp -R $(BUILD_PREFIX)/lib/clang/17/lib/wasi $(BUILD_PREFIX)/lib/clang/17/lib/wasip1 | ||
| cp -R $(BUILD_PREFIX)/lib/clang/17/lib/wasi $(BUILD_PREFIX)/lib/clang/17/lib/wasip2 |
There was a problem hiding this comment.
Can these use $(CLANG_VERSION) instead of hard-coding 17?
There was a problem hiding this comment.
Ah yes indeed! I didn't look hard enough to find that.
do you mean wasm32-wasi-threads? |
MaxDesiatov
pushed a commit
to swiftlang/swift
that referenced
this pull request
Jul 22, 2025
…83199) - **Explanation**: Renames the WebAssembly target triple from `wasm32-unknown-wasi` to `wasm32-unknown-wasip1` to align with the broader WebAssembly ecosystem's naming conventions. It's important to include this in 6.2, which is going to be the first stable release of Swift SDK for Wasm, so that we won't introduce a breaking triple change in the stable version series later. The WebAssembly ecosystem has been migrating from the generic wasi target name to more explicit version-specific names like `wasip1` and `wasip2`. This change has been adopted across multiple toolchains and language ecosystems: - Rust: Renamed `wasm32-wasi` to `wasm32-wasip1` (rust-lang/compiler-team#607) - wasi-sdk: Renamed `wasm32-wasi` to `wasm32-wasip1` (WebAssembly/wasi-sdk#386) - Go: Already uses `wasip1` naming convention (golang/go#58141) The "p1" suffix explicitly indicates WASI Preview 1, which helps distinguish it from the newer WASI Preview 2 (wasip2) and provides clarity about which version of the WASI specification is being targeted. Also we already use `wasm32-unknown-wasip1` for Embedded WASI target, and having different names for Embedded and non-Embedded is confusing users. - **Scope**: Narrow, only affects Wasm Swift SDK. - **Original PRs**: #83167 - **Risk**: Low, just a change to Wasm Swift SDK - **Testing**: CI. - **Reviewers**: @MaxDesiatov
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 commit is a reflection of WebAssembly/wasi-libc#478 into this repository where a few changes are happening:
wasm32-wasip1sysroot is prepared matchingwasm32-wasiwasm32-wasip1-threadssysroot is prepared matchingwasm32-wasi-threadswasm32-wasi-preview2target is renamedwasm32-wasip2I've done a bit of makefile refactoring to deduplicate things a bit now that there's a number of targets being built.
The long-term goal would be to remove the
wasm32-wasiandwasm32-wasip1-threadstargets, but that's not proposed just yet at this time.