r324684 amd64 buildworld failed if WITHOUT_ZFS is defined

===> sys/boot/efi/boot1 (all)
cc -target x86_64-unknown-freebsd12.0 --
sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin  -O2 
-pipe -ffreestanding -Wformat -mno-mmx -mno-sse -mno-avx -msoft-
float -fshort-wchar -mno-red-zone -mno-aes -march=nehalem  -
DLOADER_UFS_SUPPORT -DLOADER_DISK_SUPPORT -DLOADER_GPT_SUPPORT -
DLOADER_MBR_SUPPORT -DLOADER_GELI_SUPPORT -
I/usr/src/sys/boot/libsa -I/usr/src/sys/boot/common -I. -
I/usr/src/sys/boot/efi/boot1/../include -
I/usr/src/sys/boot/efi/boot1/../include/amd64 -
I/usr/src/sys/boot/efi/boot1/../../../contrib/dev/acpica/include 
-I/usr/src/sys/boot/efi/boot1/../../.. -DEFI_UFS_BOOT -
I/usr/src/sys/boot/efi/boot1/../../common -fPIC -ffreestanding -
Wformat -mno-mmx -mno-sse -mno-avx -msoft-float -fshort-wchar -
mno-red-zone -mno-aes -g -MD  -MF.depend.boot1.o -MTboot1.o -
std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -
Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -
Wpointer-arith -Wno-uninitialized -Wno-pointer-sign -Wno-empty-
body -Wno-string-plus-int -Wno-unused-const-variable -Wno-
tautological-compare -Wno-unused-value -Wno-parentheses-equality 
-Wno-unused-function -Wno-enum-conversion -Wno-unused-local-
typedef -Wno-address-of-packed-member -Wno-format -Qunused-
arguments  -c /usr/src/sys/boot/efi/boot1/boot1.c -o boot1.o
/usr/src/sys/boot/efi/boot1/boot1.c:269:1: error: no previous 
prototype for function 'efi_zfs_is_preferred'
      [-Werror,-Wmissing-prototypes]
efi_zfs_is_preferred(EFI_HANDLE *h)
^
/usr/src/sys/boot/efi/boot1/boot1.c:381:2: error: unknown type 
name 'zfsinfo_list_t'; did you mean
      'pdinfo_list_t'?
        zfsinfo_list_t *zfsi_list;
        ^~~~~~~~~~~~~~
        pdinfo_list_t                                                                                        
/usr/src/sys/boot/efi/boot1/../include/efilib.h:49:42: note: 
'pdinfo_list_t' declared here
typedef STAILQ_HEAD(pdinfo_list, pdinfo) pdinfo_list_t;
                                         ^
/usr/src/sys/boot/efi/boot1/boot1.c:382:2: error: use of 
undeclared identifier 'zfsinfo_t'
        zfsinfo_t *zi;
        ^
/usr/src/sys/boot/efi/boot1/boot1.c:382:13: error: use of 
undeclared identifier 'zi'
        zfsinfo_t *zi;
                   ^
4 errors generated.
*** Error code 1

Stop.
make[6]: stopped in /usr/src/sys/boot/efi/boot1
*** Error code 1