feat: mi for linux again

web-infra-dev · Nov 5, 2024 · 9725e80 · 9725e80
1 parent 5be6826
commit 9725e80
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rspack_allocator/Cargo.toml b/crates/rspack_allocator/Cargo.toml
@@ -5,11 +5,9 @@ license     = "MIT"
 name        = "rspack_allocator"
 repository  = "https://github.com/web-infra-dev/rspack"
 version     = "0.1.0"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[target.'cfg(any(target_os = "linux", target_env = "msvc"))'.dependencies]
+[target.'cfg(target_os = "linux")'.dependencies]
 # Turned on `local_dynamic_tls` to avoid issue: https://github.com/microsoft/mimalloc/issues/147
 mimalloc = { workspace = true, features = ["local_dynamic_tls"] }
-
-[target.'cfg(not(any(target_os = "linux", target_env = "msvc")))'.dependencies]
-tikv-jemallocator = "0.6"
diff --git a/crates/rspack_allocator/src/lib.rs b/crates/rspack_allocator/src/lib.rs
@@ -1,7 +1,3 @@
-#[cfg(not(any(target_os = "linux", target_env = "msvc")))]
-#[global_allocator]
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
-
-#[cfg(any(target_os = "linux", target_env = "msvc"))]
+#[cfg(target_os = "linux")]
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;