From 6fd96c93c1ff811e03dc4676c9fde93d11467a20 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 5 Dec 2017 21:37:59 +0000 Subject: [PATCH] Make sure we include the right path for skein.h, as well only include the ZFS flags for zfs_modules.c. This keeps us from pulling from the system or sysroot during buildworld. --- stand/efi/boot1/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index 731599e9863..5443b4296a6 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -31,9 +31,10 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-function SRCS= boot1.c self_reloc.c start.S ufs_module.c .if ${MK_ZFS} != "no" SRCS+= zfs_module.c -CFLAGS+= -I${ZFSSRC} -CFLAGS+= -I${SYSDIR}/cddl/boot/zfs -CFLAGS+= -DEFI_ZFS_BOOT +CFLAGS.zfs_module.c+= -I${ZFSSRC} +CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs +CFLAGS.zfs_module.c+= -I${SYSDIR}/crypto/skein +CFLAGS.zfs_module.c+= -DEFI_ZFS_BOOT LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif