From owner-svn-src-all@freebsd.org  Tue Apr 26 18:08:53 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 0DC0DB1DBE0;
 Tue, 26 Apr 2016 18:08:53 +0000 (UTC)
 (envelope-from bdrewery@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 CF8E11AA3;
 Tue, 26 Apr 2016 18:08:52 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QI8plJ091686;
 Tue, 26 Apr 2016 18:08:51 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QI8p3a091685;
 Tue, 26 Apr 2016 18:08:51 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201604261808.u3QI8p3a091685@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 26 Apr 2016 18:08:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298654 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2016 18:08:53 -0000

Author: bdrewery
Date: Tue Apr 26 18:08:51 2016
New Revision: 298654
URL: https://svnweb.freebsd.org/changeset/base/298654

Log:
  WITH_META_MODE: Allow buildkernel to create .meta files with curdir==objdir.
  
  Without this the incremental build was broken since .depend.* are not
  generated with .MAKE.MODE=meta and .meta files were not created to
  track dependencies.  Typically meta mode does not create .meta files
  when building with curdir==objdir but the kernel build is special.
  
  Reported by:	Nikolai Lifanov <lifanov@mail.lifanov.com>
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Apr 26 17:39:54 2016	(r298653)
+++ head/Makefile.inc1	Tue Apr 26 18:08:51 2016	(r298654)
@@ -531,6 +531,11 @@ IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLA
 # kernel stage
 KMAKEENV=	${WMAKEENV}
 KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
+.if ${MK_META_MODE} == "yes"
+# meta mode normally is disallowed when building from curdir==objdir, but we
+# want to allow it for the kernel build.
+KMAKE+=	.MAKE.MODE="${.MAKE.MODE} curdirOk=yes"
+.endif
 
 #
 # buildworld