1 files changed, 5 insertions, 2 deletions

diff --git a/release/arm/release.sh b/release/arm/release.sh
index 837991eb6bf1..6a2e7e71214a 100755
--- a/release/arm/release.sh
+++ b/release/arm/release.sh
@@ -61,11 +61,14 @@ 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 obj depend all install
+		WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
 	# Build the 'xdev' target for crochet.
 	eval chroot ${CHROOTDIR} make -C /usr/src \
-		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} WITH_GCC=1 xdev
+		XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} WITH_GCC=1 \
+		${WORLD_FLAGS} xdev
 
 	# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
 	# is created.