diff options
| author | eatradish <sakiiily@aosc.io> | 2021-12-23 16:13:44 +0800 |
|---|---|---|
| committer | David Peter <sharkdp@users.noreply.github.com> | 2021-12-28 14:15:45 +0100 |
| commit | 639ed34791b7341aa2fe192d638f6f14eaab7088 (patch) | |
| tree | a5d88828f781a79470c93197ed5bf11146938c1b | |
| parent | da7ea790348c352b74c6ffb7c30b1e8b4e09a9b8 (diff) | |
Allow use to disable jemalloc
jemalloc will require special flags on devices where page size is not 4K. With default options fd will not work on a Mac Mini M1 where hardware only allow 16K paging size. This commit will allow the user to turn off jemalloc (using --no-default-features) under special circumstances where jemalloc is not usable.
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | src/main.rs | 3 |
2 files changed, 7 insertions, 2 deletions
@@ -66,7 +66,7 @@ libc = "0.2" # 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 = "android"), not(target_os = "macos"), not(target_os = "freebsd"), not(target_env = "musl")))'.dependencies] -jemallocator = "0.3.0" +jemallocator = {version = "0.3.0", optional = true} [dev-dependencies] diff = "0.1" @@ -77,3 +77,7 @@ test-case = "1.2" [profile.release] lto = true codegen-units = 1 + +[features] +use-jemalloc = ["jemallocator"] +default = ["use-jemalloc"]
\ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 56d6bfb..8ff1478 100644 --- a/src/main.rs +++ b/src/main.rs @@ -39,7 +39,8 @@ use crate::regex_helper::{pattern_has_uppercase_char, pattern_matches_strings_wi not(target_os = "android"), not(target_os = "macos"), not(target_os = "freebsd"), - not(target_env = "musl") + not(target_env = "musl"), + feature = "use-jemalloc" ))] #[global_allocator] static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; |