diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 38284b7691c..2fa748716e3 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -64,8 +64,9 @@ else
 	_triplet="${xbps_machine}-pc-linux-gnu"
 fi
 
-do_build()
+do_configure()
 {
+	set +e
 	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
 		local SAVEDPATH=$PATH
@@ -88,6 +89,18 @@ do_build()
 		--enable-linker-build-id --enable-gnu-unique-object \
 		--enable-checking=release
 
+	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
+	set -e
+}
+
+do_build()
+{
+	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}
 	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
 }