Author: kmacy
Date: Wed Jun 10 01:18:07 2009
New Revision: 193876
URL: http://svn.freebsd.org/changeset/base/193876
Log:
- enable building of loader by default
- fix MK_ZFS == "no" and MK_CDDL == "no" handling
Modified:
stable/7/sys/boot/i386/Makefile
stable/7/sys/boot/i386/loader/Makefile
Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile Wed Jun 10 01:15:30 2009
(r193875)
+++ stable/7/sys/boot/i386/Makefile Wed Jun 10 01:18:07 2009
(r193876)
@@ -1,9 +1,10 @@
# $FreeBSD$
+.include <bsd.own.mk>
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
kgzldr libi386 libfirewire loader
-.if defined(LOADER_ZFS_SUPPORT)
+.if ${MK_ZFS}
SUBDIR+= zfsboot gptzfsboot
.endif
Modified: stable/7/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/7/sys/boot/i386/loader/Makefile Wed Jun 10 01:15:30 2009
(r193875)
+++ stable/7/sys/boot/i386/loader/Makefile Wed Jun 10 01:18:07 2009
(r193876)
@@ -16,9 +16,11 @@ LIBFIREWIRE= ${.OBJDIR}/../libfirewire/l
.endif
# Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support
-.if defined(LOADER_ZFS_SUPPORT)
+.if ${MK_ZFS} != "no"
CFLAGS+= -DLOADER_ZFS_SUPPORT
LIBZFS= ${.OBJDIR}/../../zfs/libzfsboot.a
+.else
+LIBZFS=
.endif
# Enable PXE TFTP or NFS support, not both.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
