diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 947046c58d..2f7b59ec21 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -24,13 +24,11 @@ replaces="libmudflap>=0 libmudflap-devel>=0 chroot-gcc>=0"
 subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
 subpackages+=" libitm libitm-devel libssp libssp-devel gcc-c++"
 
-if [ -z "$CROSS_BUILD" ]; then
+if [ -n "$CHROOT_READY" -a -z "$CROSS_BUILD" ]; then
 	subpackages+=" gcc-fortran gcc-objc gcc-objc++"
 	subpackages+=" libgfortran-devel libgfortran"
 	subpackages+=" libobjc-devel libobjc"
-fi
 
-if [ -n "$CHROOT_READY" -a -z "$CROSS_BUILD" ]; then
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			# XXX disable go and java with musl
@@ -99,31 +97,35 @@ do_configure() {
 			;;
 	esac
 
+	if [ -z "$CHROOT_READY" -o -n "$CROSS_BUILD" ]; then
+		_langs="c,c++,lto"
+	fi
+
 	if [ "$CROSS_BUILD" ]; then
 		export CC_FOR_TARGET="$CC"
 		export GCC_FOR_TARGET="$CC"
 		export CXX_FOR_TARGET="$CXX"
 
-		_langs="c,c++,lto"
 		_args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}"
 		_args+=" --enable-sjlj-exceptions=no"
 	else
-		case "$XBPS_TARGET_MACHINE" in
-			# XXX disable go and java with musl
-			*-musl) _langs="c,c++,objc,obj-c++,fortran,lto";;
-			*) _langs="c,c++,objc,obj-c++,fortran,lto,go,java";;
-		esac
-		_args+=" --build=${_triplet} --enable-java-gc=boehm --enable-fast-character"
+		if [ -z "$CHROOT_READY" ]; then
+			export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
+			_args+=" --with-gmp=${XBPS_MASTERDIR}/usr"
+			_args+=" --with-mpfr=${XBPS_MASTERDIR}/usr"
+			_args+=" --with-isl=${XBPS_MASTERDIR}/usr"
+			_args+=" --with-mpc=${XBPS_MASTERDIR}/usr"
+			_args+=" --with-cloog=${XBPS_MASTERDIR}/usr"
+		else
+			case "$XBPS_TARGET_MACHINE" in
+				# XXX disable go and java with musl
+				*-musl) _langs="c,c++,objc,obj-c++,fortran,lto";;
+				*) _langs="c,c++,objc,obj-c++,fortran,lto,go,java";;
+			esac
+			_args+=" --build=${_triplet} --enable-java-gc=boehm --enable-fast-character"
+		fi
 	fi
 
-	if [ -z "$CHROOT_READY" ]; then
-		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
-		_args+=" --with-gmp=${XBPS_MASTERDIR}/usr"
-		_args+=" --with-mpfr=${XBPS_MASTERDIR}/usr"
-		_args+=" --with-isl=${XBPS_MASTERDIR}/usr"
-		_args+=" --with-mpc=${XBPS_MASTERDIR}/usr"
-		_args+=" --with-cloog=${XBPS_MASTERDIR}/usr"
-	fi
 	case "$XBPS_TARGET_MACHINE" in
 		aarch64*|*-musl) _args+=" --disable-libsanitizer";;
 	esac