give up on custom cfg setting, use cfg_aliases instead

memorysafety · Oct 11, 2024 · a9059f6 · a9059f6
1 parent 998ee59
commit a9059f6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,6 +34,7 @@ zerocopy = { version = "0.7.32", features = ["derive"] }
 
 [build-dependencies]
 cc = "1.0.79"
+cfg_aliases = "0.2.1"
 nasm-rs = { version = "0.3", features = ["parallel"] }
 
 [features]

diff --git a/build.rs b/build.rs
@@ -327,11 +327,15 @@ mod asm {
 
 fn main() {
     // TODO(#7671): Rerun is getting linker errors on Linux right now with enabled asm features.
+    cfg_aliases::cfg_aliases! { asm: { any(
+        all(feature = "asm_nonlinux", not(target_os = "linux")),
+        all(feature = "asm_linux", target_os = "linux")
+    ) } };
+
     if cfg!(any(
         all(feature = "asm_nonlinux", not(target_os = "linux")),
         all(feature = "asm_linux", target_os = "linux"),
     )) {
-        println!("cargo:rustc-check-cfg=cfg(\"asm\")");
         asm::main();
     }
 

diff --git a/tools/Cargo.toml b/tools/Cargo.toml
@@ -23,8 +23,15 @@ libc = "0.2"
 rav1d = { path = "../", version = "1.0.0", default-features = false }
 
 [features]
-default = ["asm", "asm_arm64_dotprod", "asm_arm64_i8mm", "bitdepth_8", "bitdepth_16"]
-asm = ["rav1d/asm"]
+default = [
+    "asm_nonlinux",
+    "asm_arm64_dotprod",
+    "asm_arm64_i8mm",
+    "bitdepth_8",
+    "bitdepth_16",
+]
+asm_nonlinux = ["rav1d/asm_nonlinux"]
+asm_linux = ["rav1d/asm_linux"]
 asm_arm64_dotprod = ["rav1d/asm_arm64_dotprod"]
 asm_arm64_i8mm = ["rav1d/asm_arm64_i8mm"]
 bitdepth_8 = ["rav1d/bitdepth_8"]