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>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
