From 4477cac768ea34b38cd5baa929f2110d4d5564a1 Mon Sep 17 00:00:00 2001
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Tue, 25 Feb 2014 18:00:55 +0000
Subject: [PATCH] Teach userboot to comply with WITHOUT_CDDL/WITHOUT_ZFS

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
---
 sys/boot/userboot/userboot/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile
index b3bba107f5ba..5cce1fd6bcfc 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/sys/boot/userboot/userboot/Makefile
@@ -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