Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/make dieQuietly: ignore OP_SUBMAKE



details:   https://anonhg.NetBSD.org/src/rev/38a51e80994b
branches:  trunk
changeset: 973173:38a51e80994b
user:      sjg <sjg%NetBSD.org@localhost>
date:      Mon Jun 22 20:15:25 2020 +0000

description:
dieQuietly: ignore OP_SUBMAKE

Stick to OP_MAKE for deciding when to supress noise
as OP_SUBMAKE can be too aggressive.

Reviewed by: gson

diffstat:

 usr.bin/make/main.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 1caec6f6d087 -r 38a51e80994b usr.bin/make/main.c
--- a/usr.bin/make/main.c       Mon Jun 22 19:56:36 2020 +0000
+++ b/usr.bin/make/main.c       Mon Jun 22 20:15:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.275 2020/06/19 21:17:48 sjg Exp $   */
+/*     $NetBSD: main.c,v 1.276 2020/06/22 20:15:25 sjg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.275 2020/06/19 21:17:48 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.276 2020/06/22 20:15:25 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.275 2020/06/19 21:17:48 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.276 2020/06/22 20:15:25 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2027,7 +2027,7 @@
        else if (bf >= 0)
            quietly = bf;
        else
-           quietly = (gn) ? ((gn->type  & (OP_MAKE|OP_SUBMAKE)) != 0) : 0;
+           quietly = (gn) ? ((gn->type  & (OP_MAKE)) != 0) : 0;
     }
     return quietly;
 }



Home | Main Index | Thread Index | Old Index