Skip to content
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.

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

Start renaming preview1 to p1 and preview2 to p2 #386

Merged
merged 2 commits into from
Mar 6, 2024

Conversation

alexcrichton
Copy link
Collaborator

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
Copy link
Collaborator Author

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 alexcrichton marked this pull request as ready for review March 5, 2024 15:48
@alexcrichton
Copy link
Collaborator Author

With WebAssembly/wasi-libc#478 now landed I've updated this to the official submodule and this is no longer a draft.

Makefile Outdated
@@ -156,11 +152,15 @@ build/compiler-rt.BUILT: build/llvm.BUILT
DESTDIR=$(DESTDIR) ninja $(NINJA_FLAGS) -C build/compiler-rt install
# 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these use $(CLANG_VERSION) instead of hard-coding 17?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes indeed! I didn't look hard enough to find that.

@sunfishcode sunfishcode enabled auto-merge (squash) March 6, 2024 21:16
@sunfishcode sunfishcode merged commit c2f9c10 into WebAssembly:main Mar 6, 2024
5 checks passed
@alexcrichton alexcrichton deleted the start-rename-targets branch March 6, 2024 22:44
@yamt
Copy link
Contributor

yamt commented Mar 8, 2024

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.

do you mean wasm32-wasi-threads?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants