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

Teach userboot to comply with WITHOUT_CDDL/WITHOUT_ZFS

Browse Source 
Apparently, LIBZFS is set to a non-empty string when WITHOUT_CDDL/WITHOUT_ZFS
are set, I think this is a bug, but work around this feature for now.

Reviewed by:	grehan
This commit is contained in:
Sean Bruno 2014-02-25 18:00:55 +00:00
parent 419749b63a
commit 4477cac768
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/userboot/userboot/Makefile
View File

@ -51,10 +51,12 @@ 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
.endif
# Always add MI sources
.PATH: ${.CURDIR}/../../common