diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index d5a73aab8b8..f5c0e62c392 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -77,6 +77,8 @@ do_configure()
 	# Do not run fixincludes
 	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
+	# Some checks return non-zero exit status, so skip them for now.
+	set +e
 	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 \
@@ -87,21 +89,14 @@ do_configure()
 		--enable-lto --with-libelf=${XBPS_MASTERDIR}/usr \
 		--enable-linker-build-id --enable-gnu-unique-object \
 		--enable-checking=release
+	set -e
 
 	[ -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
+	make ${makejobs}
 }
 
 do_install()