diff options
| author | Dan Gohman <sunfish@mozilla.com> | 2019-04-19 09:59:35 -0700 |
|---|---|---|
| committer | Dan Gohman <sunfish@mozilla.com> | 2019-05-03 23:01:24 -0700 |
| commit | 33ea556cb5301479c3cefe100d7a3216d135f5b0 (patch) | |
| tree | 31d7f1a454c1bddc4d667281bffaeb52194ea1c5 | |
| parent | e2326366935613816927e679d3b2dc04db44678c (diff) | |
| download | rust-33ea556cb5301479c3cefe100d7a3216d135f5b0.tar.gz rust-33ea556cb5301479c3cefe100d7a3216d135f5b0.zip | |
Categorize WASI as an "OS" rather than as an "environment".
This distinction is fairly abstract, but in practice, the main advantage here is that LLVM's triple code considers WASI to be an OS, so this makes rustc agree with that.
| -rw-r--r-- | src/librustc_target/spec/wasm32_unknown_wasi.rs | 4 | ||||
| -rw-r--r-- | src/libstd/os/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/mod.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_target/spec/wasm32_unknown_wasi.rs b/src/librustc_target/spec/wasm32_unknown_wasi.rs index aeabe663292..0412635bfe2 100644 --- a/src/librustc_target/spec/wasm32_unknown_wasi.rs +++ b/src/librustc_target/spec/wasm32_unknown_wasi.rs @@ -102,8 +102,8 @@ pub fn target() -> Result<Target, String> { target_endian: "little".to_string(), target_pointer_width: "32".to_string(), target_c_int_width: "32".to_string(), - target_os: "unknown".to_string(), - target_env: "wasi".to_string(), + target_os: "wasi".to_string(), + target_env: String::new(), target_vendor: "unknown".to_string(), data_layout: "e-m:e-p:32:32-i64:64-n32:64-S128".to_string(), arch: "wasm32".to_string(), diff --git a/src/libstd/os/mod.rs b/src/libstd/os/mod.rs index d48b5acffc0..7b56d6d62cf 100644 --- a/src/libstd/os/mod.rs +++ b/src/libstd/os/mod.rs @@ -51,7 +51,7 @@ cfg_if! { #[cfg(target_os = "emscripten")] pub mod emscripten; #[cfg(target_os = "fuchsia")] pub mod fuchsia; #[cfg(target_os = "hermit")] pub mod hermit; -#[cfg(target_env = "wasi")] pub mod wasi; +#[cfg(target_os = "wasi")] pub mod wasi; #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] pub mod fortanix_sgx; pub mod raw; diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs index d7ce6a08e01..3f3cedc53b7 100644 --- a/src/libstd/sys/mod.rs +++ b/src/libstd/sys/mod.rs @@ -35,7 +35,7 @@ cfg_if! { } else if #[cfg(target_os = "redox")] { mod redox; pub use self::redox::*; - } else if #[cfg(target_env = "wasi")] { + } else if #[cfg(target_os = "wasi")] { mod wasi; pub use self::wasi::*; } else if #[cfg(target_arch = "wasm32")] { |