Update the WASI support.

- WASI is now categorized as an OS rather than an environment.
   (https://github.com/rust-lang/rust/pull/60117)
 - The WASI triple is renamed from wasm32-unknown-wasi to wasm32-wasi.
   (https://github.com/rust-lang/rust/pull/60585)
This commit is contained in:
Dan Gohman 2019-05-15 11:50:27 -07:00
parent 3142dee2f3
commit 6eb55f15d0
3 changed files with 11 additions and 11 deletions

View File

@ -64,7 +64,7 @@ matrix:
install:
- rustup target add wasm32-unknown-unknown
- rustup target add wasm32-unknown-emscripten
- rustup target add wasm32-unknown-wasi
- rustup target add wasm32-wasi
- nvm install 9
- ./utils/ci/install_cargo_web.sh
- cargo web prepare-emscripten
@ -81,7 +81,7 @@ matrix:
#- cargo web test --target wasm32-unknown-emscripten
#- cargo web test --nodejs --target wasm32-unknown-emscripten
#- cargo build --target wasm32-unknown-unknown # without any features
- cargo build --target wasm32-unknown-wasi
- cargo build --target wasm32-wasi
- cargo build --target wasm32-unknown-unknown --features=wasm-bindgen
- cargo web test --target wasm32-unknown-unknown --features=stdweb
- cargo build --manifest-path tests/wasm_bindgen/Cargo.toml --target wasm32-unknown-unknown

View File

@ -36,8 +36,8 @@ fuchsia-cprng = "0.1"
wasm-bindgen = { version = "0.2.29", optional = true }
stdweb = { version = "0.4.9", optional = true }
[target.wasm32-unknown-wasi.dependencies]
libc = "0.2.51"
[target.wasm32-wasi.dependencies]
libc = "0.2.54"
[features]
std = []

View File

@ -46,8 +46,8 @@
//! enabled `wasm-bindgen` will be used. If neither feature is enabled,
//! `getrandom` will always fail.
//!
//! The WASI target `wasm32-unknown-wasi` uses the `__wasi_random_get`
//! function defined by the WASI standard.
//! The WASI target `wasm32-wasi` uses the `__wasi_random_get` function defined
//! by the WASI standard.
//!
//!
//! ## Early boot
@ -143,7 +143,7 @@ extern crate std;
target_os = "linux",
all(
target_arch = "wasm32",
not(target_env = "wasi")
not(target_os = "wasi")
),
))]
mod utils;
@ -190,13 +190,13 @@ mod_use!(cfg(target_os = "redox"), use_file);
mod_use!(cfg(target_os = "solaris"), solaris_illumos);
mod_use!(cfg(windows), windows);
mod_use!(cfg(target_env = "sgx"), sgx);
mod_use!(cfg(target_env = "wasi"), wasi);
mod_use!(cfg(target_os = "wasi"), wasi);
mod_use!(
cfg(all(
target_arch = "wasm32",
not(target_os = "emscripten"),
not(target_env = "wasi"),
not(target_os = "wasi"),
feature = "wasm-bindgen"
)),
wasm32_bindgen
@ -206,7 +206,7 @@ mod_use!(
cfg(all(
target_arch = "wasm32",
not(target_os = "emscripten"),
not(target_env = "wasi"),
not(target_os = "wasi"),
not(feature = "wasm-bindgen"),
feature = "stdweb",
)),
@ -237,7 +237,7 @@ mod_use!(
target_arch = "wasm32",
any(
target_os = "emscripten",
target_env = "wasi",
target_os = "wasi",
feature = "wasm-bindgen",
feature = "stdweb",
),