From f9291b066f813205192349bc67c8b790b408ccab Mon Sep 17 00:00:00 2001 From: Andrea Mah <31675041+andreamah@users.noreply.github.com> Date: Tue, 6 Jun 2023 12:05:33 -0700 Subject: [PATCH] linux-aarch64 no longer allows for 16K page size (#28) * linux-aarch64 no longer allows for 16K page size Fixes #26 * remove conditional for non arm cases * Update build/build.sh Co-authored-by: Robo * Update build/build.sh Co-authored-by: Robo * chore: cleanup conditions --------- Co-authored-by: Robo --- build/build.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/build.sh b/build/build.sh index 597f33c..f6140b3 100755 --- a/build/build.sh +++ b/build/build.sh @@ -10,12 +10,6 @@ set -ex main() { CARGO="$(builder)" - if is_linux && is_musl; then - # jemalloc doesn't allow 16K page sizes for linux musl - # https://github.com/microsoft/ripgrep-prebuilt/issues/26 - JEMALLOC_SYS_WITH_LG_PAGE=14 - fi - # Test a normal debug build. if is_arm || is_aarch64 || is_ppc64le; then "$CARGO" build --target "$TARGET" --release --features 'pcre2' @@ -23,6 +17,10 @@ main() { # https://github.com/zherczeg/sljit/issues/89 elif is_s390x; then "$CARGO" build --release --target=$TARGET + elif is_aarch64_musl; then + # force jemalloc to allow 16K page sizes for linux musl + # https://github.com/microsoft/ripgrep-prebuilt/issues/26 + JEMALLOC_SYS_WITH_LG_PAGE=14 "$CARGO" build --target "$TARGET" --release --features 'pcre2' else # Technically, MUSL builds will force PCRE2 to get statically compiled, # but we also want PCRE2 statically build for macOS binaries.