Avoid clobbering existing value of META_COOKIE_TOUCH
This commit is contained in:
parent
70c1466dad
commit
462b35ac65
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=305783
@ -114,16 +114,13 @@ _metaError: .NOMETA .NOTMAIN
|
|||||||
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
META_COOKIE_TOUCH=
|
|
||||||
# some targets need to be .PHONY in non-meta mode
|
|
||||||
META_NOPHONY= .PHONY
|
|
||||||
# Are we, after all, in meta mode?
|
# Are we, after all, in meta mode?
|
||||||
.if ${.MAKE.MODE:Uno:Mmeta*} != ""
|
.if ${.MAKE.MODE:Uno:Mmeta*} != ""
|
||||||
MKDEP_MK = meta.autodep.mk
|
MKDEP_MK = meta.autodep.mk
|
||||||
|
|
||||||
# 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:T}}
|
META_COOKIE_TOUCH?= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET:T}}
|
||||||
META_NOPHONY=
|
META_NOPHONY=
|
||||||
|
|
||||||
# some targets involve old pre-built targets
|
# some targets involve old pre-built targets
|
||||||
@ -159,5 +156,9 @@ BUILD_AT_LEVEL0 ?= no
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.endif
|
.endif
|
||||||
|
.else
|
||||||
|
META_COOKIE_TOUCH=
|
||||||
|
# some targets need to be .PHONY in non-meta mode
|
||||||
|
META_NOPHONY= .PHONY
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user