From d7d63eddbebc3ee3e3c7c94ef5a1c23918e68347 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 6 May 2024 11:34:03 -0400
Subject: [PATCH] Fix #1085 for real

cross doesn't pass all environment variables through into the build
container, so JEMALLOC_SYS_WITH_LG_PAGE=16 wasn't being picked up from
the host.  Instead, set it explicitly in Cross.toml.

Link: https://github.com/cross-rs/cross/wiki/Configuration
---
 .github/workflows/CICD.yml | 6 +-----
 Cross.toml                 | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 Cross.toml

diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index 7abebfdd2..c07c41cf8 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -134,11 +134,7 @@ jobs:
 
     - name: Build
       shell: bash
-      run: |
-        case ${{ matrix.job.target }} in
-          aarch64-*) export JEMALLOC_SYS_WITH_LG_PAGE=16 ;;
-        esac;
-        $BUILD_CMD build --locked --release --target=${{ matrix.job.target }}
+      run: $BUILD_CMD build --locked --release --target=${{ matrix.job.target }}
 
     - name: Set binary name & path
       id: bin
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 000000000..3a146211a
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,6 @@
+# https://github.com/sharkdp/fd/issues/1085
+[target.aarch64-unknown-linux-gnu.env]
+passthrough = ["JEMALLOC_SYS_WITH_LG_PAGE=16"]
+
+[target.aarch64-unknown-linux-musl.env]
+passthrough = ["JEMALLOC_SYS_WITH_LG_PAGE=16"]