Author: bdrewery
Date: Tue Jan 3 23:08:21 2017
New Revision: 311195
URL: https://svnweb.freebsd.org/changeset/base/311195
Log:
MFC r308600:
DIRDEPS_BUILD: Consolidate some logic for skipping of reading
Makefile.depend.
Modified:
stable/11/share/mk/bsd.dep.mk
stable/11/share/mk/bsd.subdir.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.dep.mk
==============================================================================
--- stable/11/share/mk/bsd.dep.mk Tue Jan 3 23:08:11 2017
(r311194)
+++ stable/11/share/mk/bsd.dep.mk Tue Jan 3 23:08:21 2017
(r311195)
@@ -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: stable/11/share/mk/bsd.subdir.mk
==============================================================================
--- stable/11/share/mk/bsd.subdir.mk Tue Jan 3 23:08:11 2017
(r311194)
+++ stable/11/share/mk/bsd.subdir.mk Tue Jan 3 23:08:21 2017
(r311195)
@@ -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:
_______________________________________________
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"
