svn commit: r304717 - in stable/11: share/mk sys/conf

[Bryan Drewery]

Author: bdrewery
Date: Wed Aug 24 02:23:03 2016
New Revision: 304717
URL: https://svnweb.freebsd.org/changeset/base/304717

Log:
  MFC r304697:
  
    FAST_DEPEND: Fix 'make all install' not properly rebuilding based on
    .depend.* files.

Modified:
  stable/11/share/mk/bsd.dep.mk
  stable/11/sys/conf/kern.post.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/bsd.dep.mk
==============================================================================
--- stable/11/share/mk/bsd.dep.mk	Wed Aug 24 01:56:30 2016	(r304716)
+++ stable/11/share/mk/bsd.dep.mk	Wed Aug 24 02:23:03 2016	(r304717)
@@ -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: stable/11/sys/conf/kern.post.mk
==============================================================================
--- stable/11/sys/conf/kern.post.mk	Wed Aug 24 01:56:30 2016	(r304716)
+++ stable/11/sys/conf/kern.post.mk	Wed Aug 24 02:23:03 2016	(r304717)
@@ -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