Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make JobFinish: call PrintOnError if we detected an ...
details: https://anonhg.NetBSD.org/src/rev/f59b0c2dfd37
branches: trunk
changeset: 755703:f59b0c2dfd37
user: sjg <sjg%NetBSD.org@localhost>
date: Thu Jun 17 03:36:05 2010 +0000
description:
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.
diffstat:
usr.bin/make/job.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diffs (39 lines):
diff -r 50d8982acfd2 -r f59b0c2dfd37 usr.bin/make/job.c
--- a/usr.bin/make/job.c Thu Jun 17 03:13:58 2010 +0000
+++ b/usr.bin/make/job.c Thu Jun 17 03:36:05 2010 +0000
@@ -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);
Home |
Main Index |
Thread Index |
Old Index