Date: Tue, 5 Dec 2017 21:38:00 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326589 - head/stand/efi/boot1 Message-ID: <201712052138.vB5Lc0vk024072@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Dec 5 21:37:59 2017 New Revision: 326589 URL: https://svnweb.freebsd.org/changeset/base/326589 Log: 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. Modified: head/stand/efi/boot1/Makefile Modified: head/stand/efi/boot1/Makefile ============================================================================== --- head/stand/efi/boot1/Makefile Tue Dec 5 21:37:55 2017 (r326588) +++ head/stand/efi/boot1/Makefile Tue Dec 5 21:37:59 2017 (r326589) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712052138.vB5Lc0vk024072>