diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index f5c0e62c392..c234a297af3 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -77,8 +77,6 @@ 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 \
@@ -89,9 +87,8 @@ 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
+	[ -z "$BOOTSTRAP_PKG_REBUILD" ] || export PATH=$SAVEDPATH
 }
 
 do_build()