From owner-svn-src-head@freebsd.org  Tue Dec  5 21:38:04 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06461E8341D;
 Tue,  5 Dec 2017 21:38:03 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EAFF272795;
 Tue,  5 Dec 2017 21:38:01 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB5Lc0vn024073;
 Tue, 5 Dec 2017 21:38:00 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB5Lc0vk024072;
 Tue, 5 Dec 2017 21:38:00 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712052138.vB5Lc0vk024072@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 5 Dec 2017 21:38:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326589 - head/stand/efi/boot1
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/stand/efi/boot1
X-SVN-Commit-Revision: 326589
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Dec 2017 21:38:04 -0000

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