From 245a301e0cff44992fe88f14644c27b78caa590b Mon Sep 17 00:00:00 2001
From: mattstam <codeguy0112358@gmail.com>
Date: Mon, 22 Jul 2024 18:15:05 -0700
Subject: [PATCH] fix: library std build 2

---
 library/std/build.rs | 75 +++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/library/std/build.rs b/library/std/build.rs
index 7a47b52e8e4..e2012736c8e 100644
--- a/library/std/build.rs
+++ b/library/std/build.rs
@@ -2,50 +2,52 @@ use std::env;
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
+
     let target_arch = env::var("CARGO_CFG_TARGET_ARCH").expect("CARGO_CFG_TARGET_ARCH was not set");
     let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS was not set");
     let target_vendor =
         env::var("CARGO_CFG_TARGET_VENDOR").expect("CARGO_CFG_TARGET_VENDOR was not set");
     let target_env = env::var("CARGO_CFG_TARGET_ENV").expect("CARGO_CFG_TARGET_ENV was not set");
+
     if target_os == "netbsd" && env::var("RUSTC_STD_NETBSD10").is_ok() {
         println!("cargo:rustc-cfg=netbsd10");
     }
-    if target_os == "linux"
-        || target_os == "android"
-        || target_os == "netbsd"
-        || target_os == "dragonfly"
-        || target_os == "openbsd"
-        || target_os == "freebsd"
-        || target_os == "solaris"
-        || target_os == "illumos"
-        || target_os == "macos"
-        || target_os == "ios"
-        || target_os == "tvos"
-        || target_os == "watchos"
-        || target_os == "visionos"
-        || target_os == "windows"
-        || target_os == "fuchsia"
-        || (target_vendor == "fortanix" && target_env == "sgx")
-        || target_os == "hermit"
-        || target_os == "l4re"
-        || target_os == "redox"
-        || target_os == "haiku"
-        || target_os == "vxworks"
-        || target_arch == "wasm32"
-        || target_arch == "wasm64"
-        || target_os == "espidf"
-        || target_os.starts_with("solid")
-        || (target_vendor == "nintendo" && target_env == "newlib")
-        || target_os == "vita"
-        || target_os == "aix"
-        || target_os == "nto"
-        || target_os == "xous"
-        || target_os == "hurd"
-        || target_os == "uefi"
-        || target_os == "teeos"
-        || target_os == "zkvm"
 
-        // See src/bootstrap/src/core/build_steps/synthetic_targets.rs
+    let target = env::var("TARGET").expect("TARGET was not set");
+    if target.contains("linux")
+        || target.contains("netbsd")
+        || target.contains("dragonfly")
+        || target.contains("openbsd")
+        || target.contains("freebsd")
+        || target.contains("solaris")
+        || target.contains("illumos")
+        || target.contains("apple-darwin")
+        || target.contains("apple-ios")
+        || target.contains("apple-tvos")
+        || target.contains("apple-watchos")
+        || target.contains("uwp")
+        || target.contains("windows")
+        || target.contains("fuchsia")
+        || (target.contains("sgx") && target.contains("fortanix"))
+        || target.contains("hermit")
+        || target.contains("l4re")
+        || target.contains("redox")
+        || target.contains("haiku")
+        || target.contains("vxworks")
+        || target.contains("wasm32")
+        || target.contains("wasm64")
+        || target.contains("asmjs")
+        || target.contains("espidf")
+        || target.contains("solid")
+        || target.contains("nintendo-3ds")
+        || target.contains("vita")
+        || target.contains("aix")
+        || target.contains("nto")
+        || target.contains("xous")
+        || target.contains("hurd")
+        || target.contains("uefi")
+        || target.contains("zkvm")
+        // See src/bootstrap/synthetic_targets.rs
         || env::var("RUSTC_BOOTSTRAP_SYNTHETIC_TARGET").is_ok()
     {
         // These platforms don't have any special requirements.
@@ -61,6 +63,7 @@ fn main() {
         // - Any new targets that have not been explicitly added above.
         println!("cargo:rustc-cfg=feature=\"restricted-std\"");
     }
-    println!("cargo:rustc-env=STD_ENV_ARCH={}", env::var("CARGO_CFG_TARGET_ARCH").unwrap());
+
+    println!("cargo:rustc-env=STD_ENV_ARCH={}", target_arch);
     println!("cargo:rustc-cfg=backtrace_in_libstd");
 }