svn commit: r308600 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Sun Nov 13 00:11:07 UTC 2016
Author: bdrewery
Date: Sun Nov 13 00:11:05 2016
New Revision: 308600
URL: https://svnweb.freebsd.org/changeset/base/308600
Log:
DIRDEPS_BUILD: Consolidate some logic for skipping of reading Makefile.depend.
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/bsd.dep.mk
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk Sun Nov 13 00:11:02 2016 (r308599)
+++ head/share/mk/bsd.dep.mk Sun Nov 13 00:11:05 2016 (r308600)
@@ -82,7 +82,8 @@ _meta_filemon= 1
# since it will track dependencies itself. OBJS_DEPEND_GUESS is still used.
.if defined(_SKIP_BUILD) || defined(_meta_filemon)
_SKIP_READ_DEPEND= 1
-.if ${MK_DIRDEPS_BUILD} == "no" || make(analyze) || make(print-dir)
+.if ${MK_DIRDEPS_BUILD} == "no" || make(analyze) || make(print-dir) || \
+ make(obj) || make(clean*) || make(destroy*)
.MAKE.DEPENDFILE= /dev/null
.endif
.endif
@@ -196,7 +197,7 @@ CFLAGS+= ${DEPEND_CFLAGS}
.endif # !defined(_meta_filemon)
.endif # defined(SRCS)
-.if ${MK_DIRDEPS_BUILD} == "yes" && !make(analyze) && !make(print-dir)
+.if ${MK_DIRDEPS_BUILD} == "yes" && ${.MAKE.DEPENDFILE} != "/dev/null"
# Prevent meta.autodep.mk from tracking "local dependencies".
.depend:
.include <meta.autodep.mk>
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Sun Nov 13 00:11:02 2016 (r308599)
+++ head/share/mk/bsd.subdir.mk Sun Nov 13 00:11:05 2016 (r308600)
@@ -70,7 +70,10 @@ print-dir: .PHONY
.endif
.if !defined(NEED_SUBDIR)
-.if ${.MAKE.LEVEL} == 0 && ${MK_DIRDEPS_BUILD} == "yes" && !empty(SUBDIR) && !(make(clean*) || make(destroy*))
+# .MAKE.DEPENDFILE==/dev/null is set by bsd.dep.mk to avoid reading
+# Makefile.depend
+.if ${.MAKE.LEVEL} == 0 && ${MK_DIRDEPS_BUILD} == "yes" && !empty(SUBDIR) && \
+ ${.MAKE.DEPENDFILE} != "/dev/null"
.include <meta.subdir.mk>
# ignore this
_SUBDIR:
More information about the svn-src-all
mailing list