Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not treat .info as warning for -W

Browse Source 
Reported by: lwhsu at FreeBSD.org
This commit is contained in:
sjg 2018-02-12 21:38:09 +00:00
parent 0f74ee8d8c
commit 9d28f87b89
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/make/make.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: make.h,v 1.103 2017/07/20 19:29:54 sjg Exp $ */ /* $NetBSD: make.h,v 1.104 2018/02/12 21:38:09 sjg Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -330,6 +330,7 @@ typedef struct GNode {
* once the makefile has been parsed. PARSE_WARNING means it can. Passed * once the makefile has been parsed. PARSE_WARNING means it can. Passed
* as the first argument to Parse_Error. * as the first argument to Parse_Error.
*/ */
#define PARSE_INFO 3
#define PARSE_WARNING 2 #define PARSE_WARNING 2
#define PARSE_FATAL 1 #define PARSE_FATAL 1

10
usr.bin/make/parse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: parse.c,v 1.225 2017/04/17 13:29:07 maya Exp $ */ /* $NetBSD: parse.c,v 1.226 2018/02/12 21:38:09 sjg Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -69,14 +69,14 @@
*/ */
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: parse.c,v 1.225 2017/04/17 13:29:07 maya Exp $"; static char rcsid[] = "$NetBSD: parse.c,v 1.226 2018/02/12 21:38:09 sjg Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else #else
__RCSID("$NetBSD: parse.c,v 1.225 2017/04/17 13:29:07 maya Exp $"); __RCSID("$NetBSD: parse.c,v 1.226 2018/02/12 21:38:09 sjg Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -703,6 +703,8 @@ ParseVErrorInternal(FILE *f, const char *cfname, size_t clineno, int type,
(void)vfprintf(f, fmt, ap); (void)vfprintf(f, fmt, ap);
(void)fprintf(f, "\n"); (void)fprintf(f, "\n");
(void)fflush(f); (void)fflush(f);
if (type == PARSE_INFO)
return;
if (type == PARSE_FATAL || parseWarnFatal) if (type == PARSE_FATAL || parseWarnFatal)
fatals += 1; fatals += 1;
if (parseWarnFatal && !fatal_warning_error_printed) { if (parseWarnFatal && !fatal_warning_error_printed) {
@ -795,7 +797,7 @@ ParseMessage(char *line)
switch(*line) { switch(*line) {
case 'i': case 'i':
mtype = 0; mtype = PARSE_INFO;
break; break;
case 'w': case 'w':
mtype = PARSE_WARNING; mtype = PARSE_WARNING;