Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Make the test for infinite recursion in PRINTOBJDIR...



details:   https://anonhg.NetBSD.org/src/rev/143eba70f4e8
branches:  trunk
changeset: 782784:143eba70f4e8
user:      apb <apb%NetBSD.org@localhost>
date:      Tue Nov 20 10:43:21 2012 +0000

description:
Make the test for infinite recursion in PRINTOBJDIR more specific,
and make the error case more easily recognisable.

Now "make -V '${PRINTOBJDIR}'" works instead of misinterpreting the "-V"
as infinite recursion.

diffstat:

 share/mk/bsd.own.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r f51f24756808 -r 143eba70f4e8 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Nov 20 08:02:06 2012 +0000
+++ b/share/mk/bsd.own.mk       Tue Nov 20 10:43:21 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.712 2012/11/15 19:49:12 jkunz Exp $
+#      $NetBSD: bsd.own.mk,v 1.713 2012/11/20 10:43:21 apb Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -70,14 +70,14 @@
 
 HAVE_GDB?=     7
 
-.if empty(.MAKEFLAGS:M-V*)
+.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=   ${MAKE} -r -V .OBJDIR -f /dev/null xxx
 .else
 PRINTOBJDIR=   ${MAKE} -V .OBJDIR
 .endif
 .else
-PRINTOBJDIR=   echo # prevent infinite recursion
+PRINTOBJDIR=   echo /error/bsd.own.mk/PRINTOBJDIR # avoid infinite recursion
 .endif
 
 #



Home | Main Index | Thread Index | Old Index