d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the MK_ZFS != "no" case slightly to avoid a name

Browse Source 
clash with LIBZFS in bsd.lib.mk

Submitted by:	Max N Boyarov   zotrix at bsd dot by
OK'd by:	sbruno
This commit is contained in:
Peter Grehan 2014-02-26 04:49:09 +00:00
parent 650afa9b8f
commit ee89f3d53c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/boot/userboot/userboot/Makefile
View File

@ -53,9 +53,7 @@ LIBSTAND= ${.OBJDIR}/../libstand/libstand.a
.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>