Module Name: src
Committed By: sjg
Date: Thu Jun 17 03:36:05 UTC 2010
Modified Files:
src/usr.bin/make: job.c
Log Message:
JobFinish: call PrintOnError if we detected an error we are not ignoring.
This gives the .ERROR target a chance to run at the first sign of trouble.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/usr.bin/make/job.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/job.c
diff -u src/usr.bin/make/job.c:1.150 src/usr.bin/make/job.c:1.151
--- src/usr.bin/make/job.c:1.150 Thu Jun 3 15:40:15 2010
+++ src/usr.bin/make/job.c Thu Jun 17 03:36:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.150 2010/06/03 15:40:15 sjg Exp $ */
+/* $NetBSD: job.c,v 1.151 2010/06/17 03:36:05 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.150 2010/06/03 15:40:15 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.151 2010/06/17 03:36:05 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.150 2010/06/03 15:40:15 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.151 2010/06/17 03:36:05 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1020,8 +1020,11 @@
job->node->name,
WEXITSTATUS(status),
(job->flags & JOB_IGNERR) ? "(ignored)" : "");
- if (job->flags & JOB_IGNERR)
+ if (job->flags & JOB_IGNERR) {
status = 0;
+ } else {
+ PrintOnError(job->node, NULL);
+ }
} else if (DEBUG(JOB)) {
if (job->node != lastNode) {
MESSAGE(stdout, job->node);
