Module Name: src Committed By: sjg Date: Mon Jun 22 20:15:25 UTC 2020
Modified Files: src/usr.bin/make: main.c Log Message: dieQuietly: ignore OP_SUBMAKE Stick to OP_MAKE for deciding when to supress noise as OP_SUBMAKE can be too aggressive. Reviewed by: gson To generate a diff of this commit: cvs rdiff -u -r1.275 -r1.276 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.275 src/usr.bin/make/main.c:1.276 --- src/usr.bin/make/main.c:1.275 Fri Jun 19 21:17:48 2020 +++ src/usr.bin/make/main.c Mon Jun 22 20:15:25 2020 @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19 #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 @@ dieQuietly(GNode *gn, int bf) 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; }