summaryrefslogtreecommitdiff
path: root/job.c
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@kolpackov.net>2005-05-31 20:54:30 +0000
committerBoris Kolpackov <boris@kolpackov.net>2005-05-31 20:54:30 +0000
commita8569e652d9423de6c1b5c421b8dad996ca0c258 (patch)
treefdcc9f84496083cac0fa2a852c56e9409c50be56 /job.c
parent6a88549948915c2b8f5b88c45ef347e75218202b (diff)
downloadmake-a8569e652d9423de6c1b5c421b8dad996ca0c258.tar.gz
Fixed Savannah bugs #13216 and #13218.
Diffstat (limited to 'job.c')
-rw-r--r--job.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/job.c b/job.c
index fbd78a0c..83494450 100644
--- a/job.c
+++ b/job.c
@@ -470,6 +470,7 @@ reap_children (int block, int err)
register struct child *lastc, *c;
int child_failed;
int any_remote, any_local;
+ int dontcare;
if (err && block)
{
@@ -686,12 +687,17 @@ reap_children (int block, int err)
if (c->good_stdin)
good_stdin_used = 0;
+ dontcare = c->file->dontcare;
+
if (child_failed && !c->noerror && !ignore_errors_flag)
{
/* 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);
+
+ if (!dontcare)
+ child_error (c->file->name, exit_code, exit_sig, coredump, 0);
+
c->file->update_status = 2;
if (delete_on_error == -1)
{
@@ -791,7 +797,7 @@ reap_children (int block, int err)
/* If the job failed, and the -k flag was not given, die,
unless we are already in the process of dying. */
- if (!err && child_failed && !keep_going_flag &&
+ if (!err && child_failed && !dontcare && !keep_going_flag &&
/* fatal_error_signal will die with the right signal. */
!handling_fatal_signal)
die (2);