Start renaming preview1 to p1 and preview2 to p2 #386
Conversation
|
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. |
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 | |||
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? |
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.