From 1dc762d4fb032506ef0ffdef9cb549a430d29173 Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Wed, 23 Sep 2020 19:15:22 +0000
Subject: [PATCH] loader: fix non-zfs build

We can not include zfs headers while building without zfs.

Reported by:	Oscar Holmlund
---
 stand/efi/loader/main.c      | 2 ++
 stand/i386/loader/main.c     | 2 +-
 stand/i386/zfsboot/zfsboot.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 2f1add17b318..06e517ba76d1 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/boot.h>
+#ifdef EFI_ZFS_BOOT
 #include <sys/zfs_bootenv.h>
+#endif
 #include <paths.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c
index d6831e68e3b4..ceeaf7260acc 100644
--- a/stand/i386/loader/main.c
+++ b/stand/i386/loader/main.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/psl.h>
 #include <sys/disk.h>
 #include <sys/reboot.h>
-#include <sys/zfs_bootenv.h>
 #include <common/drv.h>
 
 #include "bootstrap.h"
@@ -50,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include "btxv86.h"
 
 #ifdef LOADER_ZFS_SUPPORT
+#include <sys/zfs_bootenv.h>
 #include "libzfs.h"
 #endif
 
diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c
index 9e66e89f4d43..ed791f14a1f3 100644
--- a/stand/i386/zfsboot/zfsboot.c
+++ b/stand/i386/zfsboot/zfsboot.c
@@ -26,7 +26,9 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <sys/reboot.h>
 #include <sys/queue.h>
+#ifdef LOADER_ZFS_SUPPORT
 #include <sys/zfs_bootenv.h>
+#endif
 
 #include <machine/bootinfo.h>
 #include <machine/elf.h>