diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
| commit | bc53a56c01080bcfa62c2433c36de981d18eb977 (patch) | |
| tree | 55e17b1e670746d9e5a85e6f1585f57a143fe34e /contrib/bmake/mk/dirdeps.mk | |
| parent | 2c4686751c3442d00e8ca8a4684be7de7901df5a (diff) | |
| parent | 168edd726ad8a54339e142aec8bee10c893b7326 (diff) | |
| download | FreeBSD-src-bc53a56c01080bcfa62c2433c36de981d18eb977.zip FreeBSD-src-bc53a56c01080bcfa62c2433c36de981d18eb977.tar.gz | |
Merge bmake-20150505 improve detection of malformed conditionals.
Diffstat (limited to 'contrib/bmake/mk/dirdeps.mk')
| -rw-r--r-- | contrib/bmake/mk/dirdeps.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/bmake/mk/dirdeps.mk b/contrib/bmake/mk/dirdeps.mk index fd03c82..4186346 100644 --- a/contrib/bmake/mk/dirdeps.mk +++ b/contrib/bmake/mk/dirdeps.mk @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.49 2015/03/11 21:39:28 sjg Exp $ +# $Id: dirdeps.mk,v 1.51 2015/05/06 06:07:30 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -349,7 +349,7 @@ BUILD_DIRDEPS ?= yes .if !defined(NO_DIRDEPS) .if ${MK_DIRDEPS_CACHE} == "yes" # this is where we will cache all our work -DIRDEPS_CACHE?= ${_OBJDIR}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,^,.,:N.} +DIRDEPS_CACHE?= ${_OBJDIR}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,/,_,g:S,^,.,:N.} # just ensure this exists build-dirdeps: @@ -394,13 +394,14 @@ _count_dirdeps: .NOMETA @echo '.info $${.newline}$${TRACER}Makefiles read: total=${.MAKE.MAKEFILES:[#]} depend=${.MAKE.MAKEFILES:M*depend*:[#]} dirdeps=${.ALLTARGETS:M${SRCTOP}*:O:u:[#]}' >&3 .endif -.endif -.elif !target(_count_dirdeps) +.elif !make(dirdeps) && !target(_count_dirdeps) beforedirdeps: _count_dirdeps _count_dirdeps: .NOMETA @echo "${TRACER}Makefiles read: total=${.MAKE.MAKEFILES:[#]} depend=${.MAKE.MAKEFILES:M*depend*:[#]} dirdeps=${.ALLTARGETS:M${SRCTOP}*:O:u:[#]} seconds=`expr ${now_utc} - ${start_utc}`" .endif +.endif + .if ${BUILD_DIRDEPS} == "yes" .if ${DEBUG_DIRDEPS:@x@${DEP_RELDIR:M$x}${${DEP_RELDIR}.${DEP_MACHINE}:L:M$x}@} != "" _debug_reldir = 1 |
