From 77ad8b785c4d081fb0d8e7e30e3d57cae2b68944 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Fri, 24 Jul 2020 23:40:16 +0100
Subject: [PATCH] add native tools to path when cross building

---
 build-devkit.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build-devkit.sh b/build-devkit.sh
index 5736fdc..943b725 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -118,15 +118,10 @@ fi
 echo use $MAKE as make
 export MAKE
 
-#---------------------------------------------------------------------------------
-# Add installed devkit to the path, adjusting path on minsys
-#---------------------------------------------------------------------------------
-TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
-export PATH=$TOOLPATH/$package/bin:$PATH
-
 CROSS_PARAMS="--build=`./config.guess`"
 
 if [ ! -z $CROSSBUILD ]; then
+	export PATH=/opt/devkitpro/$package/bin:$PATH
 	prefix=$INSTALLDIR/$CROSSBUILD/$package
 	CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
 	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
@@ -134,6 +129,12 @@ else
 	prefix=$INSTALLDIR/$package
 fi
 
+#---------------------------------------------------------------------------------
+# Add installed devkit to the path, adjusting path on minsys
+#---------------------------------------------------------------------------------
+TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
+export PATH=$TOOLPATH/$package/bin:$PATH
+
 if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
 
 	echo