From 659c5f4306feff693d2a8f4caf98eaa9247f8668 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 29 May 2025 19:32:45 +0200
Subject: [PATCH] xbps-src: default to the same libc when -a is given but not
 -A

---
 xbps-src | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/xbps-src b/xbps-src
index c6b45effefd..67f6ba8fb04 100755
--- a/xbps-src
+++ b/xbps-src
@@ -382,7 +382,6 @@ XBPS_VERSION=$(xbps-uhelper -V)
 XBPS_VERSION=${XBPS_VERSION%%API*}
 XBPS_VERSION=${XBPS_VERSION##*:}
 readonly XBPS_SRC_VERSION="113"
-export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
 XBPS_OPTSTRING="1A:a:bc:CEfgGhH:iIj:Lm:No:p:qsQKr:tvV"
@@ -521,11 +520,23 @@ else
     : ${XBPS_MAKEJOBS:=1}
 fi
 
+if [ -z "$XBPS_MACHINE" ]; then
+    XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
+    # default to the same libc when -a is given but not -A
+    if [ -n "$XBPS_CROSS_BUILD" ]; then
+        if [ -z "${XBPS_CROSS_BUILD##*-musl}" ]; then
+            XBPS_MACHINE="${XBPS_MACHINE%-musl}-musl"
+        else
+            XBPS_MACHINE="${XBPS_MACHINE%-musl}"
+        fi
+    fi
+fi
+
 export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
        XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
        XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \
        XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \
-       XBPS_MAKEJOBS XBPS_PRINT_VARIABLES XBPS_IGNORE_BROKENNESS
+       XBPS_MAKEJOBS XBPS_PRINT_VARIABLES XBPS_IGNORE_BROKENNESS XBPS_MACHINE
 
 # The masterdir/hostdir variables are forced and readonly in chroot
 if [ -z "$IN_CHROOT" ]; then