From 987d25a40cf7600f79f5abd0c542140d3b5fa217 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 17 Aug 2013 09:31:57 +0200
Subject: [PATCH] build_cross_tools: use --with-hybrid-secondary when needed

---
 build/scripts/build_cross_tools | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index 74b84059d1..6347a2a33e 100755
--- a/build/scripts/build_cross_tools
+++ b/build/scripts/build_cross_tools
@@ -94,6 +94,11 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
 	$tmpLibDir || exit 1
 mkdir -p $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion
 
+gccConfigureArgs=
+if [ -n "$SECONDARY_ARCH" ]; then
+	gccConfigureArgs="$gccConfigureArgs --with-hybrid-secondary=$SECONDARY_ARCH"
+fi
+
 # force the POSIX locale, as the build (makeinfo) might choke otherwise
 export LC_ALL=POSIX
 
@@ -153,7 +158,7 @@ esac
 CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" $buildToolsDir/gcc/configure \
 	--prefix=$installDir $buildHostSpec --target=i586-pc-haiku \
 	--disable-nls --enable-shared=yes --enable-languages=c,c++ \
-	--with-headers=$tmpIncludeDir --with-libs=$tmpLibDir \
+	--with-headers=$tmpIncludeDir --with-libs=$tmpLibDir $gccConfigureArgs \
 	|| exit 1
 unset CC