Skip to content

Commit

Permalink
switch to wasm32-wasip1 target when using nightly rustc
Browse files Browse the repository at this point in the history
The old name (`wasm32-wasip1`) is no longer recognized.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
  • Loading branch information
dicej committed Nov 13, 2024
1 parent c54e926 commit 4d9528a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
- name: Install latest Rust nightly toolchain
uses: dtolnay/rust-toolchain@nightly
with:
targets: wasm32-wasi wasm32-unknown-unknown
targets: wasm32-wasip1 wasm32-unknown-unknown

- name: Install latest Rust stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-wasi wasm32-unknown-unknown
targets: wasm32-wasip1 wasm32-unknown-unknown
components: clippy, rustfmt

- name: Install Rust std source
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
before-script-linux: |
rustup install nightly
rustup component add rust-src --toolchain nightly
rustup target add wasm32-wasi wasm32-unknown-unknown
rustup target add wasm32-wasip1 wasm32-unknown-unknown
- name: Set up cross-compiled linux aarch64 build
if: matrix.config.target == 'aarch64-unknown-linux-gnu'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
- name: Install latest Rust nightly toolchain
uses: dtolnay/rust-toolchain@nightly
with:
targets: wasm32-wasi wasm32-unknown-unknown
targets: wasm32-wasip1 wasm32-unknown-unknown

- name: Install latest Rust stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-wasi wasm32-unknown-unknown
targets: wasm32-wasip1 wasm32-unknown-unknown
components: clippy, rustfmt

- name: Install Rust std source
Expand Down
7 changes: 4 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ switch.
### Prerequisites

- Tools needed to build [CPython](https://github.com/python/cpython) (Make, Clang, etc.)
- [Rust](https://rustup.rs/) stable 1.71 or later *and* nightly 2023-07-27 or later, including the `wasm32-wasi` and `wasm32-unknown-unknown` targets
- Note that we currently use the `-Z build-std` Cargo option to build the `componentize-py` runtime with position-independent code (which is not the default for `wasm32-wasi`) and this requires using a recent nightly build of Rust.
- [Rust](https://rustup.rs/) stable 1.71 or later *and* nightly 2023-07-27 or later, including the `wasm32-wasip1` and `wasm32-unknown-unknown` targets
- Note that we currently use the `-Z build-std` Cargo option to build the `componentize-py` runtime with position-independent code (which is not the default for `wasm32-wasip1`) and this requires using a recent nightly build of Rust.

For Rust, something like this should work once you have `rustup`:

```shell
rustup update
rustup install nightly
rustup component add rust-src --toolchain nightly
rustup target add wasm32-wasi wasm32-unknown-unknown
rustup target add wasm32-wasip1 wasm32-unknown-unknown
rustup target add --toolchain nightly wasm32-wasip1 wasm32-unknown-unknown
```

### Building and Running
Expand Down
4 changes: 2 additions & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
.arg("-Z")
.arg("build-std=panic_abort,std")
.arg("--release")
.arg("--target=wasm32-wasi");
.arg("--target=wasm32-wasip1");

for (key, _) in env::vars_os() {
if key
Expand All @@ -132,7 +132,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
assert!(status.success());
println!("cargo:rerun-if-changed=runtime");

let path = out_dir.join("wasm32-wasi/release/libcomponentize_py_runtime.a");
let path = out_dir.join("wasm32-wasip1/release/libcomponentize_py_runtime.a");

if path.exists() {
let clang = wasi_sdk.join(format!("bin/{CLANG_EXECUTABLE}"));
Expand Down

0 comments on commit 4d9528a

Please sign in to comment.