diff options
| author | cgd <cgd@NetBSD.org> | 2001-01-13 20:36:58 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 2001-01-13 20:36:58 +0000 |
| commit | 741c8f626f6ef3dde67ce331a1627f8df434b1f6 (patch) | |
| tree | 6ea058cc9a6f706fba0fe8aa3c1df418bfaaea4b /usr.bin/make/parse.c | |
| parent | ec0954457209396b8bc1271c9d45cc827613bc9b (diff) | |
back out the change in rev 1.57. it was misguided; see discussion
on current-users (subject "build problem - multibyte.c").
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 62222b6323e..0c8d02b9390 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.57 2001/01/12 09:27:44 jdolecek Exp $ */ +/* $NetBSD: parse.c,v 1.58 2001/01/13 20:36:58 cgd Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -39,14 +39,14 @@ */ #ifdef MAKE_BOOTSTRAP -static char rcsid[] = "$NetBSD: parse.c,v 1.57 2001/01/12 09:27:44 jdolecek Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.58 2001/01/13 20:36:58 cgd Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.57 2001/01/12 09:27:44 jdolecek Exp $"); +__RCSID("$NetBSD: parse.c,v 1.58 2001/01/13 20:36:58 cgd Exp $"); #endif #endif /* not lint */ #endif @@ -1596,12 +1596,10 @@ ParseAddCmd(gnp, cmd) gn = (GNode *) Lst_Datum (Lst_Last (gn->cohorts)); if (!(gn->type & OP_HAS_COMMANDS)) (void)Lst_AtEnd(gn->commands, cmd); - else if (parseWarnFatal) { + else Parse_Error (PARSE_WARNING, "duplicate script for target \"%s\" ignored", gn->name); - } - return(0); } |
