svn commit: r294349 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Tue Jan 19 22:41:46 UTC 2016
Author: bdrewery
Date: Tue Jan 19 22:41:44 2016
New Revision: 294349
URL: https://svnweb.freebsd.org/changeset/base/294349
Log:
Define .MAKE.MODE to normal to avoid the need for :U later.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.dep.mk
head/share/mk/local.init.mk
head/share/mk/local.sys.mk
head/share/mk/sys.mk
Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk Tue Jan 19 22:41:26 2016 (r294348)
+++ head/share/mk/bsd.dep.mk Tue Jan 19 22:41:44 2016 (r294349)
@@ -150,7 +150,7 @@ beforedepend: ${DHDRS}
beforebuild: ${DHDRS}
-.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Unormal:Mmeta*} == ""
+.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Mmeta*} == ""
DEPENDFILES+= ${DEPENDFILE}.*
DEPEND_MP?= -MP
# Handle OBJS=../somefile.o hacks. Just replace '/' rather than use :T to
Modified: head/share/mk/local.init.mk
==============================================================================
--- head/share/mk/local.init.mk Tue Jan 19 22:41:26 2016 (r294348)
+++ head/share/mk/local.init.mk Tue Jan 19 22:41:44 2016 (r294349)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.if ${.MAKE.MODE:Unormal:Mmeta*} != ""
+.if ${.MAKE.MODE:Mmeta*} != ""
.if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) && ${.MAKE.MAKEFILES:M*bsd.prog.mk} == ""
.if ${.MAKE.MODE:Mleaf*} != ""
# we only want leaf dirs to build in meta mode... and we are not one
Modified: head/share/mk/local.sys.mk
==============================================================================
--- head/share/mk/local.sys.mk Tue Jan 19 22:41:26 2016 (r294348)
+++ head/share/mk/local.sys.mk Tue Jan 19 22:41:44 2016 (r294349)
@@ -25,7 +25,7 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFIL
.include "src.sys.mk"
-.if ${.MAKE.MODE:Unormal:Mmeta*} != ""
+.if ${.MAKE.MODE:Mmeta*} != ""
# we can afford to use cookies to prevent some targets
# re-running needlessly
META_COOKIE_TOUCH= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}}
Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk Tue Jan 19 22:41:26 2016 (r294348)
+++ head/share/mk/sys.mk Tue Jan 19 22:41:44 2016 (r294349)
@@ -44,11 +44,11 @@ __ENV_ONLY_OPTIONS:= \
.if ${MK_DIRDEPS_BUILD} == "yes"
.sinclude <meta.sys.mk>
-.elif ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS)
-.if ${.MAKEFLAGS:M-B} == ""
+.elif ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS) && ${.MAKEFLAGS:M-B} == ""
.MAKE.MODE= meta verbose
.endif
-.endif
+.MAKE.MODE?= normal
+
.if ${MK_AUTO_OBJ} == "yes"
# This needs to be done early - before .PATH is computed
# Don't do this for 'make showconfig' as it enables all options where meta mode
More information about the svn-src-all
mailing list