diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fe4ed1..a3e32ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ - Improved the usability of the time-based options, see #624 and #645 (@gorogoroumaru) ## Bugfixes + +- Disable jemalloc on Android, see #662 + ## Changes ## Other diff --git a/Cargo.toml b/Cargo.toml index 2c052fe..4ef3d79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ libc = "0.2" # 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] +[target.'cfg(all(not(windows), not(target_os = "android"), not(target_os = "macos"), not(target_env = "musl")))'.dependencies] jemallocator = "0.3.0" [dev-dependencies] diff --git a/src/main.rs b/src/main.rs index 4c95f06..2358669 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,7 +34,7 @@ use crate::regex_helper::pattern_has_uppercase_char; // We use jemalloc for performance reasons, see https://github.com/sharkdp/fd/pull/481 // 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")))] +#[cfg(all(not(windows), not(target_os = "android"), not(target_os = "macos"), not(target_env = "musl")))] #[global_allocator] static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;