From owner-svn-src-head@freebsd.org  Tue Dec  5 21:38:00 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 DD805E833E2;
 Tue,  5 Dec 2017 21:37:59 +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 ECD63726AF;
 Tue,  5 Dec 2017 21:37:56 +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 vB5Lbtum024017;
 Tue, 5 Dec 2017 21:37:55 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB5LbtRU024015;
 Tue, 5 Dec 2017 21:37:55 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712052137.vB5LbtRU024015@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:37:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326588 - in head/stand/i386: gptzfsboot zfsboot
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/stand/i386: gptzfsboot zfsboot
X-SVN-Commit-Revision: 326588
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:00 -0000

Author: imp
Date: Tue Dec  5 21:37:55 2017
New Revision: 326588
URL: https://svnweb.freebsd.org/changeset/base/326588

Log:
  Need to include skein in the include path so we don't get this from
  the "system" headers (though in buildworld, it's from the recently
  built sysroot).
  
  Sponsored by: Netflix

Modified:
  head/stand/i386/gptzfsboot/Makefile
  head/stand/i386/zfsboot/Makefile

Modified: head/stand/i386/gptzfsboot/Makefile
==============================================================================
--- head/stand/i386/gptzfsboot/Makefile	Tue Dec  5 21:37:50 2017	(r326587)
+++ head/stand/i386/gptzfsboot/Makefile	Tue Dec  5 21:37:55 2017	(r326588)
@@ -30,6 +30,7 @@ CFLAGS+=-DBOOTPROG=\"gptzfsboot\" \
 	-I${LDRSRC} \
 	-I${BOOTSRC}/i386/common \
 	-I${ZFSSRC} \
+	-I${SYSDIR}/crypto/skein \
 	-I${SYSDIR}/cddl/boot/zfs \
 	-I${BOOTSRC}/i386/btx/lib \
 	-I${BOOTSRC}/i386/boot2 \

Modified: head/stand/i386/zfsboot/Makefile
==============================================================================
--- head/stand/i386/zfsboot/Makefile	Tue Dec  5 21:37:50 2017	(r326587)
+++ head/stand/i386/zfsboot/Makefile	Tue Dec  5 21:37:55 2017	(r326588)
@@ -29,6 +29,7 @@ CFLAGS+=-DBOOTPROG=\"zfsboot\" \
 	-I${BOOTSRC}/i386/common \
 	-I${BOOTSRC}/i386 \
 	-I${ZFSSRC} \
+	-I${SYSDIR}/crypto/skein \
 	-I${SYSDIR}/cddl/boot/zfs \
 	-I${BTXLIB} \
 	-I${BOOTSRC}/i386/boot2 \