Merge branch 'rpc-memory-benchmark' into address-tracker-subscriptions

tiram88 · Jan 16, 2024 · 59307d1 · 59307d1
2 parents 3362171 + edbfd83
commit 59307d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,9 +74,6 @@ include = [
 ]
 
 [workspace.dependencies]
-mimalloc = { version = "0.1.39", default-features = false, features = [
-    'override',
-] }
 # kaspa-testing-integration = { version = "0.13.3", path = "testing/integration" }
 kaspa-addresses = { version = "0.13.3", path = "crypto/addresses" }
 kaspa-addressmanager = { version = "0.13.3", path = "components/addressmanager" }

diff --git a/utils/alloc/Cargo.toml b/utils/alloc/Cargo.toml
@@ -7,8 +7,14 @@ license.workspace = true
 edition.workspace = true
 include.workspace = true
 
-[dependencies]
-mimalloc.workspace = true
+[target.'cfg(not(target_os = "macos"))'.dependencies]
+mimalloc = { version = "0.1.39", default-features = false, features = [
+    'override',
+] }
+
+[target.'cfg(target_os = "macos")'.dependencies]
+# override is unstable in MacOS and is thus excluded
+mimalloc = { version = "0.1.39", default-features = false }
 
 [features]
 heap = []