summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1994-09-29 04:14:20 +0000
committerRoland McGrath <roland@redhat.com>1994-09-29 04:14:20 +0000
commit9807a2869f1b74d4b9561f25729f3cf7ff16f4a0 (patch)
tree8a656477a62072ff0b918ca369b219335006e32e
parente9521d344742418f743a26d3a68d5c47076ee7bf (diff)
downloadgunmake-9807a2869f1b74d4b9561f25729f3cf7ff16f4a0.tar.gz
(reap_children): Call delete_child_targets for non-signal error if
.DELETE_ON_ERROR is a target.
-rw-r--r--job.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/job.c b/job.c
index c9d2896..4337935 100644
--- a/job.c
+++ b/job.c
@@ -379,9 +379,15 @@ reap_children (block, err)
{
/* The commands failed. Write an error message,
delete non-precious targets, and abort. */
+ static int delete_on_error = -1;
child_error (c->file->name, exit_code, exit_sig, coredump, 0);
c->file->update_status = 1;
- if (exit_sig != 0)
+ if (delete_on_error == -1)
+ {
+ struct file *f = lookup_file (".DELETE_ON_ERROR");
+ delete_on_error = f != 0 && f->is_target;
+ }
+ if (exit_sig != 0 || delete_on_error)
delete_child_targets (c);
}
else