Date: Wed, 26 Feb 2014 04:49:09 +0000 (UTC) From: Peter Grehan <grehan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r262523 - head/sys/boot/userboot/userboot Message-ID: <201402260449.s1Q4n9G8006975@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grehan Date: Wed Feb 26 04:49:09 2014 New Revision: 262523 URL: http://svnweb.freebsd.org/changeset/base/262523 Log: Change the MK_ZFS != "no" case slightly to avoid a name clash with LIBZFS in bsd.lib.mk Submitted by: Max N Boyarov zotrix at bsd dot by OK'd by: sbruno Modified: head/sys/boot/userboot/userboot/Makefile Modified: head/sys/boot/userboot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/userboot/Makefile Wed Feb 26 03:26:00 2014 (r262522) +++ head/sys/boot/userboot/userboot/Makefile Wed Feb 26 04:49:09 2014 (r262523) @@ -53,9 +53,7 @@ LIBSTAND= ${.OBJDIR}/../libstand/libstan .if ${MK_ZFS} != "no" CFLAGS+= -DUSERBOOT_ZFS_SUPPORT -LIBZFS= ${.OBJDIR}/../zfs/libzfsboot.a -DPADD= ${LIBZFS} -LDADD= ${LIBZFS} +LIBZFSBOOT= ${.OBJDIR}/../zfs/libzfsboot.a .endif # Always add MI sources @@ -63,7 +61,7 @@ LDADD= ${LIBZFS} .include "${.CURDIR}/../../common/Makefile.inc" CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. -DPADD+= ${LIBFICL} ${LIBSTAND} -LDADD+= ${LIBFICL} ${LIBSTAND} +DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} +LDADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} .include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402260449.s1Q4n9G8006975>