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

Slightly better revision of teaching userboot how to respect MK_CDDL

Browse Source 
Reviewed by:	grehan
This commit is contained in:
Sean Bruno 2014-02-25 21:07:18 +00:00
parent 550c00ac6c
commit 70c9dd3e3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,11 +51,11 @@ 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
DPADD= ${LIBZFS}
LDADD= ${LIBZFS}
.endif
# Always add MI sources
@ -63,7 +63,7 @@ LIBZFS= ${.OBJDIR}/../zfs/libzfsboot.a
.include "${.CURDIR}/../../common/Makefile.inc"
CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -I.
DPADD= ${LIBFICL} ${LIBZFS} ${LIBSTAND}
LDADD= ${LIBFICL} ${LIBZFS} ${LIBSTAND}
DPADD+= ${LIBFICL} ${LIBSTAND}
LDADD+= ${LIBFICL} ${LIBSTAND}
.include <bsd.lib.mk>