From owner-svn-src-all@freebsd.org  Sun Nov  8 00:50:14 2015
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 EC8D6A2244C;
 Sun,  8 Nov 2015 00:50:14 +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 A877918B0;
 Sun,  8 Nov 2015 00:50:14 +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 tA80oDFq048351;
 Sun, 8 Nov 2015 00:50:13 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA80oDdV048349;
 Sun, 8 Nov 2015 00:50:13 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511080050.tA80oDdV048349@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: Sun, 8 Nov 2015 00:50:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290525 - in head: share/mk sys/conf
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.20
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: Sun, 08 Nov 2015 00:50:15 -0000

Author: bdrewery
Date: Sun Nov  8 00:50:13 2015
New Revision: 290525
URL: https://svnweb.freebsd.org/changeset/base/290525

Log:
  FAST_DEPEND: Don't enable when .MAKE.MODE=meta.
  
  This is because the .meta files generated from filemon already contain a
  list of all files read to generate the object.
  
  X-MFC-With:	r290433
  MFC after:	3 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.dep.mk
  head/sys/conf/kern.post.mk

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Sun Nov  8 00:50:09 2015	(r290524)
+++ head/share/mk/bsd.dep.mk	Sun Nov  8 00:50:13 2015	(r290525)
@@ -55,7 +55,7 @@ MKDEPCMD?=	mkdep
 .endif
 DEPENDFILE?=	.depend
 DEPENDFILES=	${DEPENDFILE}
-.if ${MK_FAST_DEPEND} == "yes"
+.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Unormal:Mmeta*} == ""
 DEPENDFILES+=	${DEPENDFILE}.*
 DEPEND_CFLAGS+=	-MD -MP -MF${DEPENDFILE}.${.TARGET}
 DEPEND_CFLAGS+=	-MT${.TARGET}

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Sun Nov  8 00:50:09 2015	(r290524)
+++ head/sys/conf/kern.post.mk	Sun Nov  8 00:50:13 2015	(r290525)
@@ -199,7 +199,7 @@ SRCS=	assym.s vnode_if.h ${BEFORE_DEPEND
 	${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	${MFILES:T:S/.m$/.h/}
 DEPENDFILES=	.depend
-.if ${MK_FAST_DEPEND} == "yes"
+.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Unormal:Mmeta*} == ""
 DEPENDFILES+=	.depend.*
 DEPEND_CFLAGS+=	-MD -MP -MF.depend.${.TARGET}
 DEPEND_CFLAGS+=	-MT${.TARGET}