summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2017-04-13 20:34:52 +0000
committerbdrewery <bdrewery@FreeBSD.org>2017-04-13 20:34:52 +0000
commit3b4e58c660c30bec20042008071e109508d6e410 (patch)
treec719b518bc8c707da9d85ed17890133b0634f51e
parentc30cad3ce23ac367f00f0a6e6509949f7fb88a6b (diff)
downloadFreeBSD-src-3b4e58c660c30bec20042008071e109508d6e410.zip
FreeBSD-src-3b4e58c660c30bec20042008071e109508d6e410.tar.gz
MFC r315461:
META_MODE: Fix not using .depend files when no OBJDIR is present.
-rw-r--r--share/mk/bsd.dep.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index acc6699..04f54cf 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -75,6 +75,13 @@ tags: ${SRCS}
.if !empty(.MAKE.MODE:Mmeta) && empty(.MAKE.MODE:Mnofilemon)
_meta_filemon= 1
.endif
+# By default META_MODE is disabled in bmake if there is no OBJDIR
+# unless .MAKE.MODE contains "curdirOk=[^0nNfF]"
+.if defined(_meta_filemon) && ${.OBJDIR} == ${.CURDIR} && \
+ (empty(.MAKE.MODE:tl:Mcurdirok=*) || \
+ !empty(.MAKE.MODE:tl:Mcurdirok=[0NnFf]*))
+.undef _meta_filemon
+.endif
# Skip reading .depend when not needed to speed up tree-walks and simple
# lookups. See _SKIP_BUILD logic in bsd.init.mk for more details.
OpenPOWER on IntegriCloud