From 6228ff542d6dc52996a79ca895c0f2b998db20a0 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Fri, 8 Mar 2024 11:33:25 -0800
Subject: Fix AArch64 release build error

---
 .github/workflows/release.yaml | 2 +-
 bin/package                    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7c290126..7ed8e471 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -53,7 +53,7 @@ jobs:
       if: ${{ matrix.target == 'aarch64-unknown-linux-musl' }}
       run: |
         sudo apt-get update
-        sudo apt-get install gcc-aarch64-linux-gnu
+        sudo apt-get install gcc-aarch64-linux-gnu libc6-dev-i386
 
     - name: Install ARM Toolchain
       if: ${{ matrix.target == 'arm-unknown-linux-musleabihf' || matrix.target == 'armv7-unknown-linux-musleabihf' }}
diff --git a/bin/package b/bin/package
index b273509b..d7949224 100755
--- a/bin/package
+++ b/bin/package
@@ -12,6 +12,10 @@ test -f Cargo.lock || cargo generate-lockfile
 echo "Installing rust toolchain for $TARGET..."
 rustup target add $TARGET
 
+if [[ $TARGET == aarch64-unknown-linux-musl ]]; then
+  export CC=aarch64-linux-gnu-gcc
+fi
+
 echo "Building just..."
 RUSTFLAGS="--deny warnings --codegen target-feature=+crt-static $TARGET_RUSTFLAGS" \
   cargo build --bin just --target $TARGET --release
-- 
cgit v1.2.3