diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-08-24 02:32:40 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-08-24 02:32:40 +0000 |
| commit | 4607f52b2456feefedbaec0d7598e64b2429f314 (patch) | |
| tree | 4d0503bdce284b6697073d7dc92f54743e59593f | |
| parent | 8a9a3bc2c1420907aecf1ad94c281adbf1dcc4ce (diff) | |
| download | FreeBSD-src-4607f52b2456feefedbaec0d7598e64b2429f314.zip FreeBSD-src-4607f52b2456feefedbaec0d7598e64b2429f314.tar.gz | |
MFS r304717:
MFC r304697:
FAST_DEPEND: Fix 'make all install' not properly rebuilding based on
.depend.* files.
Approved by: re (gjb)
| -rw-r--r-- | share/mk/bsd.dep.mk | 7 | ||||
| -rw-r--r-- | sys/conf/kern.post.mk | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index bddf575..064b829 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -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 diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 32ec5b1..f44645c 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -196,12 +196,13 @@ ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h .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 |
