summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-04-11 21:12:24 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-04-11 21:12:24 +0000
commit95166937b1548af00b656bab602c47623f97634f (patch)
tree6f4122bd94bda1b951703b7b4f3d544667d33f2f /share/mk
parentac8ea7923014064a6d931dcc1179425529dedde9 (diff)
downloadFreeBSD-src-95166937b1548af00b656bab602c47623f97634f.zip
FreeBSD-src-95166937b1548af00b656bab602c47623f97634f.tar.gz
META_MODE: Support targets that already have .OBJDIR in them for META_COOKIE.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/local.sys.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index ced441f..f6a9824 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -33,7 +33,8 @@ OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
# 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}
OpenPOWER on IntegriCloud