From 1d1eefdb7be684550d17cd550f149339cc9c2c2b Mon Sep 17 00:00:00 2001 From: sharkdp Date: Tue, 19 May 2020 16:07:12 +0200 Subject: [PATCH] Disable jemalloc on macOS This is a workaround for #498. See issue for details. closes #498 --- Cargo.toml | 5 ++++- ci/script.bash | 2 +- src/main.rs | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 14dec26..32d010d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,10 @@ users = "0.10.0" [target.'cfg(all(unix, not(target_os = "redox")))'.dependencies] libc = "0.2" -[target.'cfg(all(not(windows), not(target_env = "musl")))'.dependencies] +# FIXME: Re-enable jemalloc on macOS +# jemalloc is currently disabled on macOS due to a bug in jemalloc in combination with macOS +# Catalina. See https://github.com/sharkdp/fd/issues/498 for details. +[target.'cfg(all(not(windows), not(target_os = "macos"), not(target_env = "musl")))'.dependencies] jemallocator = "0.3.0" [dev-dependencies] diff --git a/ci/script.bash b/ci/script.bash index 693073b..5316210 100755 --- a/ci/script.bash +++ b/ci/script.bash @@ -7,5 +7,5 @@ cargo build --target "$TARGET" --verbose # We cannot run arm executables on linux if [[ $TARGET != arm-unknown-linux-* ]]; then - cargo test --target "$TARGET" --verbose --release + cargo test --target "$TARGET" --verbose fi diff --git a/src/main.rs b/src/main.rs index a7bc1af..6ffa277 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,7 +33,8 @@ use crate::options::Options; use crate::regex_helper::pattern_has_uppercase_char; // We use jemalloc for performance reasons, see https://github.com/sharkdp/fd/pull/481 -#[cfg(all(not(windows), not(target_env = "musl")))] +// FIXME: re-enable jemalloc on macOS, see comment in Cargo.toml file for more infos +#[cfg(all(not(windows), not(target_os = "macos"), not(target_env = "musl")))] #[global_allocator] static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;