Author: bdrewery
Date: Mon Apr 11 21:12:24 2016
New Revision: 297835
URL: https://svnweb.freebsd.org/changeset/base/297835
Log:
META_MODE: Support targets that already have .OBJDIR in them for META_COOKIE.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/local.sys.mk
Modified: head/share/mk/local.sys.mk
==============================================================================
--- head/share/mk/local.sys.mk Mon Apr 11 21:12:00 2016 (r297834)
+++ head/share/mk/local.sys.mk Mon Apr 11 21:12:24 2016 (r297835)
@@ -33,7 +33,8 @@ OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCT
# we can afford to use cookies to prevent some targets
# re-running needlessly but only when using filemon.
.if ${.MAKE.MODE:Mnofilemon} == ""
-META_COOKIE= ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}}
+META_COOKIE_COND= empty(.TARGET:M${.OBJDIR})
+META_COOKIE=
${COOKIE.${.TARGET}:U${${META_COOKIE_COND}:?${.OBJDIR}/${.TARGET}:${.TARGET}}}
META_COOKIE_RM= @rm -f ${META_COOKIE}
META_COOKIE_TOUCH= @touch ${META_COOKIE}
CLEANFILES+= ${META_TARGETS}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
