Skip to content

Commit 2064ffa

Browse files
committed
Do not use jemalloc on illumos
jemalloc does not work on illumos; it's use is already conditional on environments that are not msvc, so extend the conditionals involved to also exclude illumos.
1 parent 1a43134 commit 2064ffa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ tree-sitter-xml = "0.7.0"
110110
tree-sitter-yaml = "0.7.0"
111111
tree-sitter-zig = "1.1.2"
112112

113-
[target.'cfg(not(target_env = "msvc"))'.dependencies]
113+
[target.'cfg(not(any(target_env = "msvc", target_os = "illumos")))'.dependencies]
114114
tikv-jemallocator = "0.6"
115115

116116
[dev-dependencies]

src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ use crate::parse::syntax;
9191
///
9292
/// For reference, Jemalloc uses 10-20% more time (although up to 33%
9393
/// more instructions) when testing on sample files.
94-
#[cfg(not(target_env = "msvc"))]
94+
#[cfg(not(any(target_env = "msvc", target_os = "illumos")))]
9595
use tikv_jemallocator::Jemalloc;
9696

97-
#[cfg(not(target_env = "msvc"))]
97+
#[cfg(not(any(target_env = "msvc", target_os = "illumos")))]
9898
#[global_allocator]
9999
static GLOBAL: Jemalloc = Jemalloc;
100100

0 commit comments

Comments
 (0)