From d1cfb341c2a295fbad7590a4729dc9620fc65926 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 22 Nov 2014 07:00:50 +0100
Subject: [PATCH] xbps-src: properly set XBPS_MACHINE after linux32 reexec for
 x86 builds.

---
 xbps-src | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 43602edbb17..8a2ec8ee990 100755
--- a/xbps-src
+++ b/xbps-src
@@ -444,7 +444,6 @@ fi
 
 if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then
     export XBPS_ARCH=$(cat $XBPS_MASTERDIR/.xbps_chroot_init)
-    export XBPS_MACHINE=$XBPS_ARCH
     if [ "$XBPS_MACHINE" = "x86_64" -a "$XBPS_ARCH" = "i686" -a -z "$IN_CHROOT" ]; then
         # reconfigure pkgs via linux32
         linux32 xbps-reconfigure -r ${XBPS_MASTERDIR} -a &>/dev/null
@@ -452,6 +451,9 @@ if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then
         exec linux32 $0 ${XBPS_OPTIONS} $@
     fi
 fi
+if [ -n "$XBPS_ARCH" ]; then
+    export XBPS_MACHINE=$XBPS_ARCH
+fi
 
 export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     XBPS_SRCPKGDIR XBPS_COMMONDIR XBPS_BUILDDIR XBPS_REPO_DELTAS \