Generalized build target checks in windows-targets sub-crates (micr…

…osoft#2774)
JustRustThings · Aug 6, 2024 · bf2748b · bf2748b
1 parent 06cc1a1
commit bf2748b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
     }