From 41814dddbe750f8c8f309de615af9d0c9db5deb6 Mon Sep 17 00:00:00 2001
From: Herman Polloni <hpolloni@gmail.com>
Date: Fri, 28 Nov 2025 13:53:33 -0800
Subject: [PATCH] Fix bash build on aarch64 host

---
 scripts/build-deps.sh | 14 ++++++++++----
 scripts/deps/bash     |  6 ++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh
index c413827..07694e3 100755
--- a/scripts/build-deps.sh
+++ b/scripts/build-deps.sh
@@ -8,17 +8,23 @@ rm -f "$base/build/bin"/*
 
 pushd "$base/build" &>/dev/null || exit 1
 
-if [ ! -f "aarch64-linux-musl-cross.tgz" ]
+if [ "$(uname -m)" == 'aarch64' ]; then
+    MUSL_CC="aarch64-linux-musl-native"
+else
+    MUSL_CC="aarch64-linux-musl-cross"
+fi
+
+if [ ! -f "${MUSL_CC}.tgz" ]
 then
-    wget https://musl.cc/aarch64-linux-musl-cross.tgz
-    tar -xzf aarch64-linux-musl-cross.tgz
+    wget https://musl.cc/${MUSL_CC}.tgz
+    tar -xzf ${MUSL_CC}.tgz
 fi
 
 popd &>/dev/null || exit 1
 
 build=${build:-$(ls $base/scripts/deps)}
 
-export PATH="$base/build/aarch64-linux-musl-cross/bin:$PATH"
+export CC="$base/build/${MUSL_CC}/bin/aarch64-linux-musl-gcc"
 
 for script in "$base/scripts/deps/"*
 do
diff --git a/scripts/deps/bash b/scripts/deps/bash
index 1f7b004..7373b60 100755
--- a/scripts/deps/bash
+++ b/scripts/deps/bash
@@ -4,6 +4,7 @@ set -euo pipefail
 bash_repo="${bash_repo:-https://git.savannah.gnu.org/git/bash.git}"
 bash_tag="${bash_tag:-bash-5.3}"
 stdlib="${stdlib:-musl}"
+CC="${CC:-aarch64-linux-$stdlib-gcc}"
 
 pushd "build" &>/dev/null || exit 1
 
@@ -16,9 +17,10 @@ else
 fi
 
 pushd "bash" &>/dev/null || exit 1
-./configure --without-bash-malloc --enable-static-link --host="aarch64-linux-$stdlib" CC="aarch64-linux-$stdlib-gcc"
+./configure --without-bash-malloc --enable-static-link --host="aarch64-linux-$stdlib"
+make clean
 make
 mv bash ../bin/bash
 popd &>/dev/null || exit 1
 
-popd &>/dev/null || exit 1
\ No newline at end of file
+popd &>/dev/null || exit 1