Module Name: src
Committed By: sjg
Date: Thu Mar 31 06:28:42 UTC 2011
Modified Files:
src/usr.bin/make: job.c
Log Message:
We must now call meta_job_finish() after meta_job_error()
so that .ERROR_META_FILE is captured.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 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.155 src/usr.bin/make/job.c:1.156
--- src/usr.bin/make/job.c:1.155 Mon Sep 13 15:36:57 2010
+++ src/usr.bin/make/job.c Thu Mar 31 06:28:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.155 2010/09/13 15:36:57 sjg Exp $ */
+/* $NetBSD: job.c,v 1.156 2011/03/31 06:28:42 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.155 2010/09/13 15:36:57 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.156 2011/03/31 06:28:42 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.155 2010/09/13 15:36:57 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.156 2011/03/31 06:28:42 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -960,12 +960,6 @@
{
Boolean done, return_job_token;
-#ifdef USE_META
- if (useMeta) {
- meta_job_finish(job);
- }
-#endif
-
if (DEBUG(JOB)) {
fprintf(debug_file, "Jobfinish: %d [%s], status %d\n",
job->pid, job->node->name, status);
@@ -1056,6 +1050,12 @@
(void)fflush(stdout);
}
+#ifdef USE_META
+ if (useMeta) {
+ meta_job_finish(job);
+ }
+#endif
+
return_job_token = FALSE;
Trace_Log(JOBEND, job);
