From: bdrewery <bdrewery@FreeBSD.org>
Date: Sun, 8 Nov 2015 00:50:13 +0000 (+0000)
Subject: FAST_DEPEND: Don't enable when .MAKE.MODE=meta.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=656f1238f4cccbac3934c39fbb0c74069b9878d1;p=people%2Fliuw%2Ffreebsd.git

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
---

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index eea818b4975..4eb4880da3b 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -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}
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 9252b92857e..851faaeaf6c 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -199,7 +199,7 @@ SRCS=	assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
 	${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}