svn commit: r316788 - stable/11/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Apr 13 20:34:52 2017
New Revision: 316788
URL: https://svnweb.freebsd.org/changeset/base/316788

Log:
  MFC r315461:
  
    META_MODE: Fix not using .depend files when no OBJDIR is present.

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

Modified: stable/11/share/mk/bsd.dep.mk
==============================================================================
--- stable/11/share/mk/bsd.dep.mk	Thu Apr 13 20:34:02 2017	(r316787)
+++ stable/11/share/mk/bsd.dep.mk	Thu Apr 13 20:34:52 2017	(r316788)
@@ -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.