From b0d9fbf070cfa06ee3d7e6acf7b32446202d48d8 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Thu, 22 Feb 2018 18:49:53 +0000
Subject: [PATCH] Fix userboot w/ ZFS after r329725

r329725 cleaned up ZFS commands duplicated in multiple places, but userboot
was not setting HAVE_ZFS when MK_ZFS != "no". This resulted in a failure to
boot (as seen in PR 226118) in bhyve, with the following message:

/boot/userboot.so: Undefined symbol "ldi_get_size"

PR:		226118
Glanced at by:	imp
---
 stand/userboot/userboot/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
index 2aa41619e03b..29fa12c55723 100644
--- a/stand/userboot/userboot/Makefile
+++ b/stand/userboot/userboot/Makefile
@@ -42,6 +42,7 @@ NEWVERSWHAT=	"User boot" ${MACHINE_CPUARCH}
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
 LIBZFSBOOT=	${BOOTOBJ}/zfs/libzfsboot.a
+HAVE_ZFS=yes
 .endif
 
 # Always add MI sources