From dbced32af5023c85a220550e80f29fd90dff65c9 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sun, 8 Nov 2015 00:50:13 +0000 Subject: [PATCH] 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 --- share/mk/bsd.dep.mk | 2 +- sys/conf/kern.post.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index eea818b49756..4eb4880da3be 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 9252b92857ed..851faaeaf6c0 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}