From a892ed63e7c6da054e2ec7b60325e93fa14d0b85 Mon Sep 17 00:00:00 2001 From: sjg Date: Thu, 31 Mar 2011 06:50:43 +0000 Subject: Call meta_job_finish() from meta_job_error(), so that if the .ERROR target copies the .meta file, it has been completed. meta_job_finish() is safe to call again. --- usr.bin/make/meta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'usr.bin/make') diff --git a/usr.bin/make/meta.c b/usr.bin/make/meta.c index a0dea285819..a62bc709411 100644 --- a/usr.bin/make/meta.c +++ b/usr.bin/make/meta.c @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.15 2011/03/30 22:03:49 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.16 2011/03/31 06:50:43 sjg Exp $ */ /* * Implement 'meta' mode. @@ -656,6 +656,7 @@ meta_job_error(Job *job, GNode *gn, int flags, int status) if (pbm && pbm->meta_fname[0]) { Var_Set(".ERROR_META_FILE", pbm->meta_fname, VAR_GLOBAL, 0); } + meta_job_finish(job); } void -- cgit