diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 38284b7691..d5a73aab8b 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -64,7 +64,7 @@ else
 	_triplet="${xbps_machine}-pc-linux-gnu"
 fi
 
-do_build()
+do_configure()
 {
 	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
@@ -77,7 +77,7 @@ do_build()
 	# Do not run fixincludes
 	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-	./configure ${CONFIGURE_SHARED_ARGS} --libexecdir=/usr/lib \
+	CONFIG_SHELL=/bin/bash ./configure ${CONFIGURE_SHARED_ARGS} --libexecdir=/usr/lib \
 		--enable-clocale=gnu --disable-bootstrap --libdir=/usr/lib \
 		--enable-threads=posix --enable-__cxa_atexit --disable-multilib \
 		--enable-languages=c,c++,objc,obj-c++,fortran,go,lto --enable-tls \
@@ -88,10 +88,22 @@ do_build()
 		--enable-linker-build-id --enable-gnu-unique-object \
 		--enable-checking=release
 
-	make ${makejobs}
 	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
 }
 
+do_build()
+{
+	set +e 
+#	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
+#		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
+#		local SAVEDPATH=$PATH
+#		export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+#	fi
+
+	make ${makejobs} || return 1
+#	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
+}
+
 do_install()
 {
 	if [ "$xbps_machine" = "x86_64" ]; then