svn commit: r329831 - head/stand/userboot/userboot

[Kyle Evans]

Author: kevans
Date: Thu Feb 22 18:49:53 2018
New Revision: 329831
URL: https://svnweb.freebsd.org/changeset/base/329831

Log:
  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

Modified:
  head/stand/userboot/userboot/Makefile

Modified: head/stand/userboot/userboot/Makefile
==============================================================================
--- head/stand/userboot/userboot/Makefile	Thu Feb 22 17:47:16 2018	(r329830)
+++ head/stand/userboot/userboot/Makefile	Thu Feb 22 18:49:53 2018	(r329831)
@@ -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