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}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
