Index: usr.bin/gh-bc/Makefile
===================================================================
--- usr.bin/gh-bc/Makefile
+++ usr.bin/gh-bc/Makefile
@@ -54,8 +54,8 @@
 MAN_SRC_DC=	dc/A.1
 
 # prevent floating point incompatibilities caused by -flto on some architectures
-.if ${MACHINE_ARCH} != mips && ${MACHINE_ARCH} != mips64 && \
-    ${MACHINE_ARCH} != powerpc64 && ${MACHINE_ARCH} != riscv64
+.if ${MACHINE_CPUARCH} != "mips" && !${MACHINE_ARCH:Mpowerpc64*} && \
+    ${MACHINE_CPUARCH} != "riscv"
 CFLAGS+=	-flto
 .endif