Slightly better revision of teaching userboot how to respect MK_CDDL
Reviewed by: grehan
This commit is contained in:
parent
550c00ac6c
commit
70c9dd3e3d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=262495
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user