diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index c427b90d29d..b60ba6ab3f8 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -31,11 +31,10 @@ conflicts="firefox-esr>=0"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-case $XBPS_MACHINE in
-	i686*) 	# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-		nodebug=yes
-		;;
-esac
+# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+fi
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)