diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2007-04-07 19:12:10 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2007-04-07 19:12:10 +0000 |
| commit | 48be553b825f5049865589f4b2e5d8556fb08432 (patch) | |
| tree | 46d7e92ef7f39b4d7df7f7aeaa9b35a9b0eb880b /cddl | |
| parent | 29665eac3fb3a9097f9655325e097c0227e92940 (diff) | |
| download | src-48be553b825f5049865589f4b2e5d8556fb08432.tar.gz src-48be553b825f5049865589f4b2e5d8556fb08432.zip | |
Build ZFS on amd64 and pc98.
Approved by: pjd@
Notes
Notes:
svn path=/head/; revision=168475
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/Makefile | 4 | ||||
| -rw-r--r-- | cddl/usr.bin/Makefile | 4 | ||||
| -rw-r--r-- | cddl/usr.sbin/Makefile | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 88554e2f0a92..272e0dd610fb 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 8739cedad60a..b703d19d4aa4 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 7b11900d905b..bfb917171321 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> |