svn commit: r304720 - in releng/11.0: share/mk sys/conf
Bryan Drewery
bdrewery at FreeBSD.org
Wed Aug 24 02:32:41 UTC 2016
Author: bdrewery
Date: Wed Aug 24 02:32:40 2016
New Revision: 304720
URL: https://svnweb.freebsd.org/changeset/base/304720
Log:
MFS r304717:
MFC r304697:
FAST_DEPEND: Fix 'make all install' not properly rebuilding based on
.depend.* files.
Approved by: re (gjb)
Modified:
releng/11.0/share/mk/bsd.dep.mk
releng/11.0/sys/conf/kern.post.mk
Directory Properties:
releng/11.0/ (props changed)
Modified: releng/11.0/share/mk/bsd.dep.mk
==============================================================================
--- releng/11.0/share/mk/bsd.dep.mk Wed Aug 24 02:31:03 2016 (r304719)
+++ releng/11.0/share/mk/bsd.dep.mk Wed Aug 24 02:32:40 2016 (r304720)
@@ -76,12 +76,13 @@ tags: ${SRCS}
_meta_filemon= 1
.endif
-# Skip reading .depend when not needed to speed up tree-walks
-# and simple lookups.
+# Skip reading .depend when not needed to speed up tree-walks and simple
+# lookups. For install, only do this if no other targets are specified.
# Also skip generating or including .depend.* files if in meta+filemon mode
# since it will track dependencies itself. OBJS_DEPEND_GUESS is still used.
.if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(obj) || make(clean*) || \
- make(install*) || make(analyze) || defined(_meta_filemon)
+ ${.TARGETS:M*install*} == ${.TARGETS} || \
+ make(analyze) || defined(_meta_filemon)
_SKIP_READ_DEPEND= 1
.if ${MK_DIRDEPS_BUILD} == "no"
.MAKE.DEPENDFILE= /dev/null
Modified: releng/11.0/sys/conf/kern.post.mk
==============================================================================
--- releng/11.0/sys/conf/kern.post.mk Wed Aug 24 02:31:03 2016 (r304719)
+++ releng/11.0/sys/conf/kern.post.mk Wed Aug 24 02:32:40 2016 (r304720)
@@ -196,12 +196,13 @@ ${SYSTEM_OBJS} genassym.o vers.o: opt_gl
.if !empty(.MAKE.MODE:Unormal:Mmeta) && empty(.MAKE.MODE:Unormal:Mnofilemon)
_meta_filemon= 1
.endif
-# Skip reading .depend when not needed to speed up tree-walks
-# and simple lookups.
+# Skip reading .depend when not needed to speed up tree-walks and simple
+# lookups. For install, only do this if no other targets are specified.
# Also skip generating or including .depend.* files if in meta+filemon mode
# since it will track dependencies itself. OBJS_DEPEND_GUESS is still used.
.if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(obj) || make(clean*) || \
- make(install*) || make(kernel-obj) || make(kernel-clean*) || \
+ ${.TARGETS:M*install*} == ${.TARGETS} || \
+ make(kernel-obj) || make(kernel-clean*) || \
make(kernel-install*) || defined(_meta_filemon)
_SKIP_READ_DEPEND= 1
.MAKE.DEPENDFILE= /dev/null
More information about the svn-src-all
mailing list