From 1a491e2304387c2a50c5a0ae219e8d5a0ce1bc89 Mon Sep 17 00:00:00 2001
From: Simonas Kazlauskas <git@kazlauskas.me>
Date: Sat, 10 Apr 2021 23:28:58 +0300
Subject: [PATCH] Set target_family="wasm" for wasm targets

---
 compiler/rustc_target/src/spec/mod.rs       | 2 +-
 compiler/rustc_target/src/spec/wasm_base.rs | 1 +
 src/test/ui/cfg/cfg-family.rs               | 4 ++--
 src/test/ui/cfg/cfg-target-family.rs        | 7 +++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index 2223237143b8f..3ac9b5b3d3b7f 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
@@ -1046,7 +1046,7 @@ pub struct TargetOptions {
     ///
     /// Common options are: "unix", "windows". Defaults to no families.
     ///
-    /// See https://doc.rust-lang.org/reference/conditional-compilation.html#target_family
+    /// See <https://doc.rust-lang.org/reference/conditional-compilation.html#target_family>.
     pub families: Vec<String>,
     /// Whether the target toolchain's ABI supports returning small structs as an integer.
     pub abi_return_struct_as_int: bool,
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
index b208eb92f8ff9..87e740de08e91 100644
--- a/compiler/rustc_target/src/spec/wasm_base.rs
+++ b/compiler/rustc_target/src/spec/wasm_base.rs
@@ -61,6 +61,7 @@ pub fn options() -> TargetOptions {
 
     TargetOptions {
         is_like_wasm: true,
+        families: vec!["wasm".to_string()],
 
         // we allow dynamic linking, but only cdylibs. Basically we allow a
         // final library artifact that exports some symbols (a wasm module) but
diff --git a/src/test/ui/cfg/cfg-family.rs b/src/test/ui/cfg/cfg-family.rs
index 912bda4b5e500..c7d196a2aa6eb 100644
--- a/src/test/ui/cfg/cfg-family.rs
+++ b/src/test/ui/cfg/cfg-family.rs
@@ -1,6 +1,6 @@
-// run-pass
+// build-pass
 // pretty-expanded FIXME #23616
-// ignore-wasm32-bare no target_family
+// ignore-wasm32-bare no bare family
 // ignore-sgx
 
 #[cfg(windows)]
diff --git a/src/test/ui/cfg/cfg-target-family.rs b/src/test/ui/cfg/cfg-target-family.rs
index b4dc1b738638c..90a59fab8e250 100644
--- a/src/test/ui/cfg/cfg-target-family.rs
+++ b/src/test/ui/cfg/cfg-target-family.rs
@@ -1,5 +1,4 @@
-// run-pass
-// ignore-wasm32-bare no target_family
+// build-pass
 // ignore-sgx
 
 // pretty-expanded FIXME #23616
@@ -11,3 +10,7 @@ pub fn main() {
 #[cfg(target_family = "unix")]
 pub fn main() {
 }
+
+#[cfg(target_family="wasm")]
+pub fn main() {
+}