Index: head/usr.bin/mkcsmapper_static/Makefile
===================================================================
--- head/usr.bin/mkcsmapper_static/Makefile	(revision 295976)
+++ head/usr.bin/mkcsmapper_static/Makefile	(revision 295977)
@@ -1,17 +1,15 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkcsmapper
 
 PROG=	mkcsmapper_static
 SRCS=	citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
 	citrus_lookup_factory.c citrus_pivot_factory.c
 MAN=
 NO_SHARED= yes
-.if ${MACHINE} == "host"
-NO_WARNS= yes
-.endif
+NO_WMISSING_VARIABLE_DECLARATIONS=
 
 build-tools: mkcsmapper_static
 
 .include "${.CURDIR}/../mkcsmapper/Makefile.inc"
 .include <bsd.prog.mk>
Index: head/usr.bin/mkesdb_static/Makefile
===================================================================
--- head/usr.bin/mkesdb_static/Makefile	(revision 295976)
+++ head/usr.bin/mkesdb_static/Makefile	(revision 295977)
@@ -1,17 +1,15 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkesdb
 
 PROG=	mkesdb_static
 SRCS=	citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
 	citrus_lookup_factory.c
 MAN=
 NO_SHARED= yes
-.if ${MACHINE} == "host"
-NO_WARNS= yes
-.endif
+NO_WMISSING_VARIABLE_DECLARATIONS=
 
 build-tools: mkesdb_static
 
 .include "${.CURDIR}/../mkesdb/Makefile.inc"
 .include <bsd.prog.mk>