From 3b4ffdabfcd7f5baf81aa0da8733f7c8a72b40bc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 17 Apr 2013 14:51:25 +0200
Subject: [PATCH] chroot-gcc: fix bootstrap build.

---
 srcpkgs/chroot-gcc/template | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template
index f8675ce0c9..ebadefc1eb 100644
--- a/srcpkgs/chroot-gcc/template
+++ b/srcpkgs/chroot-gcc/template
@@ -51,9 +51,11 @@ _gmp_build() {
 	cd gmp-build
 	[ -f .gmp_build_done ] && return
 
-	../gmp-${_gmp_ver}/configure \
-		${CONFIGURE_SHARED_ARGS} --prefix=${wrksrc}/buildtmp \
-		--disable-shared --enable-static
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		export ABI=32
+	fi
+	../gmp-${_gmp_ver}/configure --prefix=${wrksrc}/buildtmp \
+		--disable-shared --enable-static "$@"
 
 	make ${makejobs}
 	make install
@@ -69,10 +71,9 @@ _mpfr_build() {
 	cd mpfr-build
 	[ -f .mpfr_build_done ] && return
 
-	../mpfr-${_mpfr_ver}/configure \
-		${CONFIGURE_SHARED_ARGS} --prefix=${wrksrc}/buildtmp \
+	../mpfr-${_mpfr_ver}/configure --prefix=${wrksrc}/buildtmp \
 		--with-gmp=${wrksrc}/buildtmp \
-		--disable-shared --enable-static
+		--disable-shared --enable-static "$@"
 
 	make ${makejobs}
 	make install
@@ -88,11 +89,10 @@ _mpc_build() {
 	cd mpc-build
 	[ -f .mpc_build_done ] && return
 
-	../mpc-${_mpc_ver}/configure \
-		${CONFIGURE_SHARED_ARGS} --prefix=${wrksrc}/buildtmp \
+	../mpc-${_mpc_ver}/configure --prefix=${wrksrc}/buildtmp \
 		--with-gmp=${wrksrc}/buildtmp \
 		--with-mpfr=${wrksrc}/buildtmp \
-		--disable-shared --enable-static
+		--disable-shared --enable-static "$@"
 
 	make ${makejobs}
 	make install
@@ -111,9 +111,6 @@ do_configure() {
 
 	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		_floatabi="--with-float=hard"
-	elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-		# Required by gmp
-		export ABI=32
 	fi
 
 	if [ "$CROSS_BUILD" ]; then
@@ -127,9 +124,9 @@ do_configure() {
 		export CXXFLAGS="$CFLAGS"
 	fi
 
-	_gmp_build
-	_mpfr_build
-	_mpc_build
+	_gmp_build ${_args}
+	_mpfr_build ${_args}
+	_mpc_build ${_args}
 
 	cd ${wrksrc}
 	[ ! -d gcc-build ] && mkdir gcc-build