diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index b8b2c7cd9d5..d5a73aab8b8 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -66,7 +66,6 @@ fi
 
 do_configure()
 {
-	set +e
 	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 		unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
 		local SAVEDPATH=$PATH
@@ -90,19 +89,19 @@ do_configure()
 		--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
+	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}
-	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
+	make ${makejobs} || return 1
+#	[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
 }
 
 do_install()