d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define .MAKE.MODE to normal to avoid the need for :U later.

Browse Source 
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
bdrewery 2016-01-19 22:41:44 +00:00
parent 6f7a5b7e28
commit 2beef85d71
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/bsd.dep.mk
View File

@ -150,7 +150,7 @@ beforedepend: ${DHDRS}
beforebuild: ${DHDRS} beforebuild: ${DHDRS}
.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Unormal:Mmeta*} == "" .if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Mmeta*} == ""
DEPENDFILES+= ${DEPENDFILE}.* DEPENDFILES+= ${DEPENDFILE}.*
DEPEND_MP?= -MP DEPEND_MP?= -MP
# Handle OBJS=../somefile.o hacks. Just replace '/' rather than use :T to # Handle OBJS=../somefile.o hacks. Just replace '/' rather than use :T to

2
share/mk/local.init.mk
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.if ${.MAKE.MODE:Unormal:Mmeta*} != "" .if ${.MAKE.MODE:Mmeta*} != ""
.if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) && ${.MAKE.MAKEFILES:M*bsd.prog.mk} == "" .if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) && ${.MAKE.MAKEFILES:M*bsd.prog.mk} == ""
.if ${.MAKE.MODE:Mleaf*} != "" .if ${.MAKE.MODE:Mleaf*} != ""
# we only want leaf dirs to build in meta mode... and we are not one # we only want leaf dirs to build in meta mode... and we are not one

2
share/mk/local.sys.mk
View File

@ -25,7 +25,7 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH
.include "src.sys.mk" .include "src.sys.mk"
.if ${.MAKE.MODE:Unormal:Mmeta*} != "" .if ${.MAKE.MODE:Mmeta*} != ""
# we can afford to use cookies to prevent some targets # we can afford to use cookies to prevent some targets
# re-running needlessly # re-running needlessly
META_COOKIE_TOUCH= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}} META_COOKIE_TOUCH= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}}

6
share/mk/sys.mk
View File

@ -44,11 +44,11 @@ __ENV_ONLY_OPTIONS:= \
.if ${MK_DIRDEPS_BUILD} == "yes" .if ${MK_DIRDEPS_BUILD} == "yes"
.sinclude <meta.sys.mk> .sinclude <meta.sys.mk>
.elif ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS) .elif ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS) && ${.MAKEFLAGS:M-B} == ""
.if ${.MAKEFLAGS:M-B} == ""
.MAKE.MODE= meta verbose .MAKE.MODE= meta verbose
.endif .endif
.endif .MAKE.MODE?= normal
.if ${MK_AUTO_OBJ} == "yes" .if ${MK_AUTO_OBJ} == "yes"
# This needs to be done early - before .PATH is computed # 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 # Don't do this for 'make showconfig' as it enables all options where meta mode