diff --git a/release/arm/release.sh b/release/arm/release.sh
index 3d1a52b970dd..c067fe9f1b31 100755
--- a/release/arm/release.sh
+++ b/release/arm/release.sh
@@ -92,14 +92,9 @@ install_uboot() {
 }
 
 main() {
-	# Build gcc for use in the chroot for arm builds.
-	# This is not '-j'-safe, so force '-j1' to allow using
-	# additional, non-'-j' options specified in WORLD_FLAGS.
-	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
-		WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
 	# Build the 'xdev' target for crochet.
 	eval chroot ${CHROOTDIR} make -C /usr/src \
-		WITHOUT_CLANG_IS_CC=1 WITHOUT_CLANG=1 WITH_GCC=1 \
+		WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \
 		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
 		${WORLD_FLAGS} xdev