diff options
-rw-r--r-- | cddl/lib/Makefile | 4 | ||||
-rw-r--r-- | cddl/usr.bin/Makefile | 4 | ||||
-rw-r--r-- | cddl/usr.sbin/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/Makefile | 9 |
4 files changed, 9 insertions, 12 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 88554e2..272e0dd 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -11,10 +11,8 @@ SUBDIR+=libzfs SUBDIR+=${_libzpool} .endif -.if ${MACHINE_ARCH} == "i386" -.if ${MACHINE} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" _libzpool= libzpool .endif -.endif .include <bsd.subdir.mk> diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index 8739ced..b703d19 100644 --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -6,10 +6,8 @@ SUBDIR= ${_ztest} .endif -.if ${MACHINE_ARCH} == "i386" -.if ${MACHINE} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" _ztest= ztest .endif -.endif .include <bsd.subdir.mk> diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile index 7b11900..bfb9171 100644 --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -7,10 +7,8 @@ SUBDIR= SUBDIR+=${_zdb} .endif -.if ${MACHINE_ARCH} == "i386" -.if ${MACHINE} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" _zdb= zdb .endif -.endif .include <bsd.subdir.mk> diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 360d38b..66b1e9b 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -406,6 +406,9 @@ _stg= stg _streams= streams _wi= wi _xe= xe +.if ${MK_ZFS} != "no" || defined(ALL_MODULES) +_zfs= zfs +.endif .if ${MACHINE} == "i386" _aac= aac _acpi= acpi @@ -445,9 +448,6 @@ _rr232x= rr232x _s3= s3 _twa= twa _vesa= vesa -.if ${MK_ZFS} != "no" || defined(ALL_MODULES) -_zfs= zfs -.endif .elif ${MACHINE} == "pc98" _canbepm= canbepm _canbus= canbus @@ -505,6 +505,9 @@ _speaker= speaker _sppp= sppp _twa= twa _wi= wi +.if ${MK_ZFS} != "no" || defined(ALL_MODULES) +_zfs= zfs +.endif .endif .if ${MACHINE_ARCH} == "ia64" |