Date: Fri, 17 Mar 2017 18:08:36 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315461 - head/share/mk Message-ID: <201703171808.v2HI8anB060016@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Mar 17 18:08:36 2017 New Revision: 315461 URL: https://svnweb.freebsd.org/changeset/base/315461 Log: META_MODE: Fix not using .depend files when no OBJDIR is present. By default bmake does not allow meta mode to work unless an OBJDIR is present. It allows this if curdirok= is set with a value not starting with [0NnFf], but usually it is "yes". MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.dep.mk Modified: head/share/mk/bsd.dep.mk ============================================================================== --- head/share/mk/bsd.dep.mk Fri Mar 17 18:08:33 2017 (r315460) +++ head/share/mk/bsd.dep.mk Fri Mar 17 18:08:36 2017 (r315461) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703171808.v2HI8anB060016>