diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 42695ba114a..b0e731cdcf1 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,7 +2,7 @@
 pkgname=gcc
 _majorver=4.9
 version=${_majorver}.1
-revision=2
+revision=3
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
@@ -156,7 +156,7 @@ do_install() {
 		vinstall ${FILESDIR}/${f}.1 644 usr/share/man/man1 ${f}.1
 	done
 
-	if [ "$CROSS_BUILD" ]; then
+	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		rm -f ${DESTDIR}/usr/share/info/libquadmath.info
 	fi
 }
@@ -326,7 +326,7 @@ libobjc_package() {
 
 fi # !CHROOT_READY || !CROSS_BUILD
 
-if [ -z "$CROSS_BUILD" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 
 libquadmath-devel_package() {
 	depends="libquadmath>=${_majorver}"
@@ -347,10 +347,6 @@ libquadmath_package() {
 	}
 }
 
-fi # !CROSS_BUILD
-
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-
 libcilkrts-devel_package() {
 	depends="libcilkrts>=${_majorver}"
 	short_desc+=" - Intel(R) Cilk(TM) Plus runtime library - development files"