using cfg(target_os) in build scripts is *wrong*

see <rust-lang/cargo#4932>
maan2003 · Jul 6, 2021 · 229a3e1 · 229a3e1
1 parent b41eb58
commit 229a3e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/druid-shell/Cargo.toml b/druid-shell/Cargo.toml
@@ -90,10 +90,6 @@ gtk-sys = { version = "0.10.0", optional = true }
 nix = { version = "0.18.0", optional = true }
 x11rb = { version = "0.8.0", features = ["allow-unsafe-code", "present", "render", "randr", "xfixes", "xkb", "resource_manager", "cursor"], optional = true }
 
-[target.'cfg(target_os="linux")'.build-dependencies]
-bindgen = {version = "0.58", optional = true}
-pkg-config = { version = "0.3", optional = true }
-
 [target.'cfg(target_arch="wasm32")'.dependencies]
 wasm-bindgen = "0.2.67"
 js-sys = "0.3.44"
@@ -108,3 +104,7 @@ static_assertions = "1.1.0"
 test-env-log = { version = "0.2.5", features = ["trace"], default-features = false }
 tracing-subscriber = "0.2.15"
 unicode-segmentation = "1.7.0"
+
+[build-dependencies]
+bindgen = {version = "0.58", optional = true}
+pkg-config = { version = "0.3", optional = true }
diff --git a/druid-shell/build.rs b/druid-shell/build.rs
@@ -1,12 +1,16 @@
-#[cfg(not(all(target_os = "linux", feature = "x11")))]
+#[cfg(not(feature = "x11"))]
 fn main() {}
 
-#[cfg(all(target_os = "linux", feature = "x11"))]
+#[cfg(feature = "x11")]
 fn main() {
     use pkg_config::probe_library;
     use std::env;
     use std::path::PathBuf;
 
+    if env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux" {
+        return;
+    }
+
     probe_library("xkbcommon").unwrap();
     probe_library("xkbcommon-x11").unwrap();