Author: sjg
Date: Tue Sep 13 22:17:25 2016
New Revision: 305783
URL: https://svnweb.freebsd.org/changeset/base/305783
Log:
Avoid clobbering existing value of META_COOKIE_TOUCH
Modified:
head/share/mk/meta.sys.mk
Modified: head/share/mk/meta.sys.mk
==============================================================================
--- head/share/mk/meta.sys.mk Tue Sep 13 20:13:19 2016 (r305782)
+++ head/share/mk/meta.sys.mk Tue Sep 13 22:17:25 2016 (r305783)
@@ -114,16 +114,13 @@ _metaError: .NOMETA .NOTMAIN
.endif
-META_COOKIE_TOUCH=
-# some targets need to be .PHONY in non-meta mode
-META_NOPHONY= .PHONY
# Are we, after all, in meta mode?
.if ${.MAKE.MODE:Uno:Mmeta*} != ""
MKDEP_MK = meta.autodep.mk
# we can afford to use cookies to prevent some targets
# 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=
# some targets involve old pre-built targets
@@ -159,5 +156,9 @@ BUILD_AT_LEVEL0 ?= no
.endif
.endif
+.else
+META_COOKIE_TOUCH=
+# some targets need to be .PHONY in non-meta mode
+META_NOPHONY= .PHONY
.endif
.endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
