diff --git a/src/dropshell-build-install-requirements b/src/dropshell-build-install-requirements
index 499eb4e..9d0b03f 100755
--- a/src/dropshell-build-install-requirements
+++ b/src/dropshell-build-install-requirements
@@ -190,13 +190,20 @@ function install_unwind_musl() {
     fi
 
     # Set cross-compiler and sysroot
-    export CC="x86_64-linux-musl-gcc --sysroot=$SYSROOT"
-    export AR="x86_64-linux-musl-ar"
-    export RANLIB="x86_64-linux-musl-ranlib"
+    local CC="$MUSL_PATH/bin/${ARCH_SHORT_PREFIX}-gcc"
+    [ -f "$CC" ] || CC="$MUSL_PATH/bin/gcc"
+    local AR="$MUSL_PATH/bin/${ARCH_SHORT_PREFIX}-ar"
+    [ -f "$AR" ] || AR="$MUSL_PATH/bin/ar"
+    local RANLIB="$MUSL_PATH/bin/${ARCH_SHORT_PREFIX}-ranlib"
+    [ -f "$RANLIB" ] || RANLIB="$MUSL_PATH/bin/ranlib"
+
+    git clone https://github.com/libunwind/libunwind.git
+    cd libunwind
+    autoreconf -i
 
     # Configure for cross-compiling
-    ./configure \
-    --host=x86_64-linux-musl \
+    CC="$CC" AR="$AR" RANLIB="$RANLIB" ./configure \
+    --host="$ARCH_SHORT_PREFIX" \
     --prefix="$SYSROOT/usr" \
     --enable-static \
     --disable-shared \