diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-01-19 22:41:44 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-01-19 22:41:44 +0000 |
| commit | 2beef85d713aa641163721c8d7a07917923f1907 (patch) | |
| tree | 85ea9dd0d03098eafa162a5ecb66b5bbcaa3cdbe /share/mk | |
| parent | 6f7a5b7e289a9877b30ffc3ad101f7912757e0e3 (diff) | |
| download | FreeBSD-src-2beef85d713aa641163721c8d7a07917923f1907.zip FreeBSD-src-2beef85d713aa641163721c8d7a07917923f1907.tar.gz | |
Define .MAKE.MODE to normal to avoid the need for :U later.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.dep.mk | 2 | ||||
| -rw-r--r-- | share/mk/local.init.mk | 2 | ||||
| -rw-r--r-- | share/mk/local.sys.mk | 2 | ||||
| -rw-r--r-- | share/mk/sys.mk | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index bacdfc2..701257e 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -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 diff --git a/share/mk/local.init.mk b/share/mk/local.init.mk index f0a7abf..f020602 100644 --- a/share/mk/local.init.mk +++ b/share/mk/local.init.mk @@ -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 diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 37e1a17..c1baee5 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -25,7 +25,7 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH .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}} diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 51f2818..9271290 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -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 |
