Add wasi target family

Signed-off-by: Ryan Levick <me@ryanlevick.com>

Author: rylev

compiler/rustc_target/src/spec/targets/wasm32_wasi.rs

@@ -73,12 +73,14 @@
 //! you know what you're getting in to!
 
 use crate::spec::crt_objects;
+use crate::spec::cvs;
 use crate::spec::LinkSelfContainedDefault;
 use crate::spec::{base, Cc, LinkerFlavor, Target};
 
 pub fn target() -> Target {
     let mut options = base::wasm::options();
 
+    options.families = cvs!["wasm", "wasi"];
     options.os = "wasi".into();
     options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasi"]);
 

compiler/rustc_target/src/spec/targets/wasm32_wasi_preview1_threads.rs

@@ -72,11 +72,12 @@
 //! best we can with this target. Don't start relying on too much here unless
 //! you know what you're getting in to!
 
-use crate::spec::{base, crt_objects, Cc, LinkSelfContainedDefault, LinkerFlavor, Target};
+use crate::spec::{base, crt_objects, cvs, Cc, LinkSelfContainedDefault, LinkerFlavor, Target};
 
 pub fn target() -> Target {
     let mut options = base::wasm::options();
 
+    options.families = cvs!["wasm", "wasi"];
     options.os = "wasi".into();
 
     options.add_pre_link_args(

compiler/rustc_target/src/spec/targets/wasm32_wasi_preview2.rs

@@ -17,12 +17,14 @@
 //! <https://github.com/WebAssembly/component-model>.
 
 use crate::spec::crt_objects;
+use crate::spec::cvs;
 use crate::spec::LinkSelfContainedDefault;
 use crate::spec::{base, Target};
 
 pub fn target() -> Target {
     let mut options = base::wasm::options();
 
+    options.families = cvs!["wasm", "wasi"];
     options.os = "wasi-preview2".into();
     options.linker = Some("wasm-component-ld".into());
 

library/std/src/os/mod.rs

@@ -18,7 +18,7 @@ pub mod raw;
 #[cfg(all(
     doc,
     any(
-        all(target_arch = "wasm32", not(target_os = "wasi"), not(target_os = "wasi-preview2")),
+        all(target_arch = "wasm32", not(target_family = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
 ))]
@@ -27,7 +27,7 @@ pub mod unix {}
 #[cfg(all(
     doc,
     any(
-        all(target_arch = "wasm32", not(target_os = "wasi"), not(target_os = "wasi-preview2")),
+        all(target_arch = "wasm32", not(target_family = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
 ))]
@@ -36,7 +36,7 @@ pub mod linux {}
 #[cfg(all(
     doc,
     any(
-        all(target_arch = "wasm32", not(target_os = "wasi"), not(target_os = "wasi-preview2")),
+        all(target_arch = "wasm32", not(target_family = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
 ))]
@@ -45,7 +45,7 @@ pub mod wasi {}
 #[cfg(all(
     doc,
     any(
-        all(target_arch = "wasm32", not(target_os = "wasi"), not(target_os = "wasi-preview2")),
+        all(target_arch = "wasm32", not(target_family = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
 ))]
@@ -56,7 +56,7 @@ pub mod windows {}
 #[cfg(not(all(
     doc,
     any(
-        all(target_arch = "wasm32", not(target_os = "wasi"), not(target_os = "wasi-preview2")),
+        all(target_arch = "wasm32", not(target_family = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
 )))]
@@ -78,7 +78,7 @@ pub mod linux;
 #[cfg(not(all(
     doc,
     any(
-        all(target_arch = "wasm32", not(target_os = "wasi"), not(target_os = "wasi-preview2")),
+        all(target_arch = "wasm32", not(target_family = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
 )))]
@@ -89,7 +89,7 @@ pub mod wasi;
 #[cfg(not(all(
     doc,
     any(
-        all(target_arch = "wasm32", not(target_os = "wasi"), not(target_os = "wasi-preview2")),
+        all(target_arch = "wasm32", not(target_family = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
 )))]

src/bootstrap/src/lib.rs

@@ -90,6 +90,7 @@ const EXTRA_CHECK_CFGS: &[(Option<Mode>, &str, Option<&[&'static str]>)] = &[
     /* Extra values not defined in the built-in targets yet, but used in std */
     (Some(Mode::Std), "target_env", Some(&["libnx"])),
     (Some(Mode::Std), "target_os", Some(&["wasi-preview2"])),
+    (Some(Mode::Std), "target_family", Some(&["wasi"])),
     (Some(Mode::Std), "target_arch", Some(&["spirv", "nvptx", "xtensa"])),
     /* Extra names used by dependencies */
     // FIXME: Used by serde_json, but we should not be triggering on external dependencies.