Date: Tue, 29 Mar 2016 20:59:04 -0700 From: "Simon J. Gerraty" <sjg@juniper.net> To: Bryan Drewery <bdrewery@freebsd.org> Cc: <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org>, <sjg@juniper.net> Subject: Re: svn commit: r297040 - in head: contrib/bmake contrib/bmake/mk share/mk usr.bin/bmake Message-ID: <54145.1459310344@kaos.jnpr.net> In-Reply-To: <56FB096C.6030001@FreeBSD.org> References: <201603182003.u2IK39FS069664@repo.freebsd.org> <56FB096C.6030001@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Bryan Drewery <bdrewery@freebsd.org> wrote:
> There is still dirdeps cache code right further down below this that
> only is skipped with NO_DIRDEPS.
Ah yes.
Index: dirdeps.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /volume/cvs/sjg/mk/dirdeps.mk,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- dirdeps.mk 16 Mar 2016 00:11:53 -0000 1.62
+++ dirdeps.mk 30 Mar 2016 03:47:48 -0000 1.63
@@ -1,4 +1,4 @@
-# $Id: dirdeps.mk,v 1.62 2016/03/16 00:11:53 sjg Exp $
+# $Id: dirdeps.mk,v 1.63 2016/03/30 03:47:48 sjg Exp $
=
# Copyright (c) 2010-2013, Juniper Networks, Inc.
# All rights reserved.
@@ -304,7 +304,13 @@ DEP_SKIP_DIR =3D ${SKIP_DIR} \
=
NSkipDir =3D ${DEP_SKIP_DIR:${M_ListToSkip}}
=
-.if defined(NO_DIRDEPS) || defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS)
+.if defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS)
+NO_DIRDEPS =3D
+.elif defined(WITHOUT_DIRDEPS_BELOW)
+NO_DIRDEPS_BELOW =3D
+.endif
+
+.if defined(NO_DIRDEPS)
# confine ourselves to the original dir and below.
DIRDEPS_FILTER +=3D M${_DEP_RELDIR}*
.elif defined(NO_DIRDEPS_BELOW)
@@ -370,7 +376,7 @@ MK_DIRDEPS_CACHE ?=3D no
BUILD_DIRDEPS_CACHE ?=3D no
BUILD_DIRDEPS ?=3D yes
=
-.if !defined(NO_DIRDEPS)
+.if !defined(NO_DIRDEPS) && !defined(NO_DIRDEPS_BELOW)
.if ${MK_DIRDEPS_CACHE} =3D=3D "yes"
# this is where we will cache all our work
DIRDEPS_CACHE?=3D ${_OBJDIR}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,/,_,g=
:S,^,.,:N.}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54145.1459310344>