Index: stable/10/tools/tools/zfsboottest/Makefile
===================================================================
--- stable/10/tools/tools/zfsboottest/Makefile	(revision 290983)
+++ stable/10/tools/tools/zfsboottest/Makefile	(revision 290984)
@@ -1,28 +1,29 @@
 # $FreeBSD$
 
 .PATH:		${.CURDIR}/../../../sys/boot/zfs ${.CURDIR}/../../../sys/cddl/boot/zfs
 
 BINDIR?=	/usr/bin
 SCRIPTSDIR?=	/usr/bin
 
 PROG=		zfsboottest
 SCRIPTS=	zfsboottest.sh
 SCRIPTSNAME=	zfsboottest.sh
 MAN=
 
 CFLAGS=	-O1 \
 	-I${.CURDIR}/../../../sys/boot/zfs \
 	-I${.CURDIR}/../../../sys/cddl/boot/zfs \
 	-I. \
 	-fdiagnostics-show-option \
 	-W -Wextra -Wno-sign-compare -Wno-unused-parameter
+CFLAGS+=-m32
 LDADD+=	-lmd
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend zfsboottest.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../sys/i386/include machine
 .endif
 
 .include <bsd.prog.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 290983)
+++ stable/10	(revision 290984)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r290451