From 36480319fef49473584745cf44ef1652bdfd9b5f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Mon, 3 Apr 2017 21:16:51 +0200
Subject: [PATCH] xbps-src: fix previous (prepare_cross_sysroot needs to be run
 early).

---
 common/xbps-src/libexec/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/libexec/build.sh b/common/xbps-src/libexec/build.sh
index 5f3a800ea93..c178fb6a25a 100755
--- a/common/xbps-src/libexec/build.sh
+++ b/common/xbps-src/libexec/build.sh
@@ -32,6 +32,9 @@ readonly SOURCEPKG="$sourcepkg"
 show_pkg_build_options
 check_pkg_arch $XBPS_CROSS_BUILD
 
+if [ -z "$XBPS_CROSS_PREPARE" ]; then
+    prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
+fi
 if [ -z "$XBPS_DEPENDENCY" -a -z "$XBPS_TEMP_MASTERDIR" -a -n "$XBPS_KEEP_ALL" -a "$XBPS_CHROOT_CMD" = "proot" ]; then
     remove_pkg_autodeps
 fi
@@ -42,7 +45,6 @@ fi
 
 if [ -z "$XBPS_CROSS_PREPARE" ]; then
     install_cross_pkg $XBPS_CROSS_BUILD || exit $?
-    prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
 fi
 
 # Fetch distfiles after installing required dependencies,