Skip mimalloc on Windows aarch64 (#1279)

This adjusts the conditional compilation to skip mimalloc on Windows aarch64 in addition to WASM, where cross-compilation needs some extra work.
microsoft · Mar 20, 2024 · 05ba7e4 · 05ba7e4
1 parent bbd2cfb
commit 05ba7e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/allocator/Cargo.toml b/allocator/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
 license.workspace = true
 version.workspace = true
 
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
+[target.'cfg(not(any(target_family = "wasm", all(target_family = "windows", target_arch = "aarch64"))))'.dependencies]
 mimalloc-sys = { path = "./mimalloc-sys" }
 
 [lints]

diff --git a/allocator/src/lib.rs b/allocator/src/lib.rs
@@ -1,14 +1,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#[cfg(not(target_family = "wasm"))]
+#[cfg(not(any(
+    target_family = "wasm",
+    all(target_family = "windows", target_arch = "aarch64")
+)))]
 pub mod mimalloc;
 
 /// Declare a global allocator if the platform supports it.
 #[macro_export]
 macro_rules! assign_global {
     () => {
-        #[cfg(not(target_family = "wasm"))]
+        #[cfg(not(any(
+            target_family = "wasm",
+            all(target_family = "windows", target_arch = "aarch64")
+        )))]
         #[global_allocator]
         static GLOBAL: allocator::mimalloc::Mimalloc = allocator::mimalloc::Mimalloc;
     };