From bf2748b5388f6ecf2ef961bf9afc124b81214ae4 Mon Sep 17 00:00:00 2001
From: Dennis Duda <git@seri.tools>
Date: Fri, 5 Jan 2024 01:38:16 +0100
Subject: [PATCH] Generalized build target checks in `windows-targets`
 sub-crates (#2774)

---
 crates/targets/aarch64_gnullvm/build.rs | 5 ++++-
 crates/targets/aarch64_msvc/build.rs    | 6 ++++--
 crates/targets/i686_gnu/build.rs        | 6 ++++--
 crates/targets/i686_msvc/build.rs       | 6 ++++--
 crates/targets/x86_64_gnu/build.rs      | 5 ++++-
 crates/targets/x86_64_gnullvm/build.rs  | 5 ++++-
 crates/targets/x86_64_msvc/build.rs     | 6 ++++--
 7 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/crates/targets/aarch64_gnullvm/build.rs b/crates/targets/aarch64_gnullvm/build.rs
index 8c8f98f5ec..f6ba3ec3ff 100644
--- a/crates/targets/aarch64_gnullvm/build.rs
+++ b/crates/targets/aarch64_gnullvm/build.rs
@@ -1,6 +1,9 @@
 fn main() {
+    let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
     let target = std::env::var("TARGET").unwrap();
-    if target != "aarch64-pc-windows-gnullvm" {
+    if family != "windows" || arch != "aarch64" || env != "gnu" || !target.ends_with("-gnullvm") {
         return;
     }
 
diff --git a/crates/targets/aarch64_msvc/build.rs b/crates/targets/aarch64_msvc/build.rs
index 243d23c4f9..e1cd062f3f 100644
--- a/crates/targets/aarch64_msvc/build.rs
+++ b/crates/targets/aarch64_msvc/build.rs
@@ -1,6 +1,8 @@
 fn main() {
-    let target = std::env::var("TARGET").unwrap();
-    if target != "aarch64-pc-windows-msvc" && target != "aarch64-uwp-windows-msvc" {
+    let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
+    if family != "windows" || arch != "aarch64" || env != "msvc" {
         return;
     }
 
diff --git a/crates/targets/i686_gnu/build.rs b/crates/targets/i686_gnu/build.rs
index 9dbe7e5406..d10600d9d7 100644
--- a/crates/targets/i686_gnu/build.rs
+++ b/crates/targets/i686_gnu/build.rs
@@ -1,6 +1,8 @@
 fn main() {
-    let target = std::env::var("TARGET").unwrap();
-    if target != "i686-pc-windows-gnu" && target != "i686-uwp-windows-gnu" {
+    let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
+    if family != "windows" || arch != "x86" || env != "gnu" {
         return;
     }
 
diff --git a/crates/targets/i686_msvc/build.rs b/crates/targets/i686_msvc/build.rs
index 53892bff6b..0c00b792eb 100644
--- a/crates/targets/i686_msvc/build.rs
+++ b/crates/targets/i686_msvc/build.rs
@@ -1,6 +1,8 @@
 fn main() {
-    let target = std::env::var("TARGET").unwrap();
-    if target != "i686-pc-windows-msvc" && target != "i686-uwp-windows-msvc" {
+    let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
+    if family != "windows" || arch != "x86" || env != "msvc" {
         return;
     }
 
diff --git a/crates/targets/x86_64_gnu/build.rs b/crates/targets/x86_64_gnu/build.rs
index 7612e7935d..ea4f74aa4d 100644
--- a/crates/targets/x86_64_gnu/build.rs
+++ b/crates/targets/x86_64_gnu/build.rs
@@ -1,6 +1,9 @@
 fn main() {
+    let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
     let target = std::env::var("TARGET").unwrap();
-    if target != "x86_64-pc-windows-gnu" && target != "x86_64-uwp-windows-gnu" {
+    if family != "windows" || arch != "x86_64" || env != "gnu" || !target.ends_with("-gnu") {
         return;
     }
 
diff --git a/crates/targets/x86_64_gnullvm/build.rs b/crates/targets/x86_64_gnullvm/build.rs
index ea83354fad..15b80b8d98 100644
--- a/crates/targets/x86_64_gnullvm/build.rs
+++ b/crates/targets/x86_64_gnullvm/build.rs
@@ -1,6 +1,9 @@
 fn main() {
+    let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
     let target = std::env::var("TARGET").unwrap();
-    if target != "x86_64-pc-windows-gnullvm" {
+    if family != "windows" || arch != "x86_64" || env != "gnu" || !target.ends_with("-gnullvm") {
         return;
     }
 
diff --git a/crates/targets/x86_64_msvc/build.rs b/crates/targets/x86_64_msvc/build.rs
index c51c8caa81..ae819b9759 100644
--- a/crates/targets/x86_64_msvc/build.rs
+++ b/crates/targets/x86_64_msvc/build.rs
@@ -1,6 +1,8 @@
 fn main() {
-    let target = std::env::var("TARGET").unwrap();
-    if target != "x86_64-pc-windows-msvc" && target != "x86_64-uwp-windows-msvc" {
+    let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
+    if family != "windows" || arch != "x86_64" || env != "msvc" {
         return;
     }