svn commit: r296701 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar 11 23:45:32 2016
New Revision: 296701
URL: https://svnweb.freebsd.org/changeset/base/296701

Log:
  META_MODE: We can only use a cookie if filemon is being used.
  
  Sponsored by:	EMC / Isilon Storage Divsion

Modified:
  head/share/mk/local.sys.mk

Modified: head/share/mk/local.sys.mk
==============================================================================
--- head/share/mk/local.sys.mk	Fri Mar 11 23:45:28 2016	(r296700)
+++ head/share/mk/local.sys.mk	Fri Mar 11 23:45:32 2016	(r296701)
@@ -27,12 +27,11 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFIL
 
 .if ${.MAKE.MODE:Mmeta*} != ""
 # we can afford to use cookies to prevent some targets
-# re-running needlessly
+# re-running needlessly but only when using filemon.
+.if ${.MAKE.MODE:Mnofilemon} == ""
 META_COOKIE=		${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}}
 META_COOKIE_RM=		@rm -f ${META_COOKIE}
 META_COOKIE_TOUCH=	@touch ${META_COOKIE}
-# some targets need to be .PHONY - but not in meta mode
-META_NOPHONY=
 CLEANFILES+=		${META_TARGETS}
 _meta_dep_before:	.USEBEFORE
 	${META_COOKIE_RM}
@@ -42,9 +41,12 @@ _meta_dep_after:	.USE
 # not rerunning a command if it doesn't need to be considering its
 # metafile/filemon-tracked dependencies.
 META_DEPS=	_meta_dep_before _meta_dep_after .META
+.endif
 .else
-META_COOKIE_RM=
-META_COOKIE_TOUCH=
+# some targets need to be .PHONY - but not in meta mode
 META_NOPHONY=	.PHONY
 .endif
+META_NOPHONY?=
+META_COOKIE_RM?=
+META_COOKIE_TOUCH?=
 META_DEPS+=	${META_NOPHONY}