diff --git a/Cargo.toml b/Cargo.toml index f41e79286..6e365cdf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ faccess = "0.2.4" # 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 = "android"), not(target_os = "macos"), not(target_os = "freebsd"), not(all(target_env = "musl", target_pointer_width = "32")), not(target_arch = "riscv64")))'.dependencies] +[target.'cfg(all(not(windows), not(target_os = "android"), not(target_os = "macos"), not(target_os = "freebsd"), not(all(target_env = "musl", target_arch = "arm")), not(target_arch = "riscv64")))'.dependencies] jemallocator = {version = "0.5.0", optional = true} [dev-dependencies] diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 000000000..da552954d --- /dev/null +++ b/Cross.toml @@ -0,0 +1,5 @@ +[target.i686-unknown-linux-musl.env] +passthrough = [ + "je_cv_pthread_getname_np=no", + "je_cv_gcc_builtin_ffsl=no", +] diff --git a/src/main.rs b/src/main.rs index f204d3187..4d6be3349 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,7 @@ 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(all(target_env = "musl", target_pointer_width = "32")), + not(all(target_env = "musl", target_arch = "arm")), not(target_arch = "riscv64"), feature = "use-jemalloc" ))]