diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-01-03 23:08:21 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-01-03 23:08:21 +0000 |
| commit | eee4f0ec12e4fa5efdc55685c8387a784c13b6fe (patch) | |
| tree | 055d4e0b3f6fa8efd11ccca39659f612dd9b1b7c /share/mk | |
| parent | 58a157d4847f8af107fed80a275635e43340e80d (diff) | |
| download | FreeBSD-src-eee4f0ec12e4fa5efdc55685c8387a784c13b6fe.zip FreeBSD-src-eee4f0ec12e4fa5efdc55685c8387a784c13b6fe.tar.gz | |
MFC r308600:
DIRDEPS_BUILD: Consolidate some logic for skipping of reading
Makefile.depend.
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.dep.mk | 5 | ||||
| -rw-r--r-- | share/mk/bsd.subdir.mk | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 9d975da..acc6699 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -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> diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 7a64203..1b5f77a 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -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: |
