summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>2008-11-22 14:24:55 +0000
committerdfr <dfr@FreeBSD.org>2008-11-22 14:24:55 +0000
commitfbf7bda4ae92c353882069004b07e4b3edfcf5f0 (patch)
treeaff8ff45453baf3c187c0cb247f33516035b5f6e /sys/boot/i386
parent86c4fc01236d99ad68401d289a486d84a01cb9c0 (diff)
downloadFreeBSD-src-fbf7bda4ae92c353882069004b07e4b3edfcf5f0.zip
FreeBSD-src-fbf7bda4ae92c353882069004b07e4b3edfcf5f0.tar.gz
Fix amd64 build and re-enable gptzfsboot.
Diffstat (limited to 'sys/boot/i386')
-rw-r--r--sys/boot/i386/Makefile2
-rw-r--r--sys/boot/i386/gptzfsboot/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 6af8642..912714f 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
- kgzldr libi386 libfirewire loader
+ gptzfsboot kgzldr libi386 libfirewire loader
# special boot programs, 'self-extracting boot2+loader'
SUBDIR+= pxeldr
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index 985c043..930061f 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -65,7 +65,7 @@ gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o
zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
.if ${MACHINE_ARCH} == "amd64"
-beforedepend gptzfsboot.o: machine
+beforedepend zfsboot.o: machine
CLEANFILES+= machine
machine:
ln -sf ${.CURDIR}/../../../i386/include machine
OpenPOWER on IntegriCloud