Index: mk/compiler.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/compiler.mk,v
retrieving revision 1.82
diff -u -r1.82 compiler.mk
--- mk/compiler.mk	9 Dec 2014 23:43:29 -0000	1.82
+++ mk/compiler.mk	5 Oct 2016 12:41:15 -0000
@@ -157,7 +157,11 @@
 .  endif
 .endfor
 
-.if defined(ABI) && !empty(ABI)
+# Some packages build their executables for multiple ABIs (like emulators)
+# Allow to disable appending a generic ABI value as it breaks them
+COMPILER_WRAPPERS_APPEND_ABI?=	yes
+
+.if defined(ABI) && !empty(ABI) && !empty(COMPILER_WRAPPERS_APPEND_ABI:M[yY][eE][sS])
 _WRAP_EXTRA_ARGS.CC+=	${_COMPILER_ABI_FLAG.${ABI}}
 _WRAP_EXTRA_ARGS.CXX+=	${_COMPILER_ABI_FLAG.${ABI}}
 _WRAP_EXTRA_ARGS.FC+=	${_COMPILER_ABI_FLAG.${ABI}}
Index: emulators/qemu/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/Makefile,v
retrieving revision 1.155
diff -u -r1.155 Makefile
--- emulators/qemu/Makefile	4 Oct 2016 15:00:08 -0000	1.155
+++ emulators/qemu/Makefile	5 Oct 2016 12:41:15 -0000
@@ -114,6 +114,8 @@
 PLIST.${_var_}=		YES
 .endfor
 
+COMPILER_WRAPPERS_APPEND_ABI=	no
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
 		${DESTDIR}${PREFIX}/share/doc/qemu/