Date: Tue, 25 Feb 2014 18:00:55 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r262487 - head/sys/boot/userboot/userboot Message-ID: <201402251800.s1PI0tJP036411@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Tue Feb 25 18:00:55 2014 New Revision: 262487 URL: http://svnweb.freebsd.org/changeset/base/262487 Log: Teach userboot to comply with WITHOUT_CDDL/WITHOUT_ZFS Apparently, LIBZFS is set to a non-empty string when WITHOUT_CDDL/WITHOUT_ZFS are set, I think this is a bug, but work around this feature for now. Reviewed by: grehan Modified: head/sys/boot/userboot/userboot/Makefile Modified: head/sys/boot/userboot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/userboot/Makefile Tue Feb 25 17:51:41 2014 (r262486) +++ head/sys/boot/userboot/userboot/Makefile Tue Feb 25 18:00:55 2014 (r262487) @@ -51,10 +51,12 @@ LIBFICL= ${.OBJDIR}/../ficl/libficl.a LIBSTAND= ${.OBJDIR}/../libstand/libstand.a .endif +.if ${MK_CDDL} != "no" .if ${MK_ZFS} != "no" CFLAGS+= -DUSERBOOT_ZFS_SUPPORT LIBZFS= ${.OBJDIR}/../zfs/libzfsboot.a .endif +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402251800.s1PI0tJP036411>