/[make]/make/job.c
ViewVC logotype

Diff of /make/job.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.163 by psmith, Sun May 8 16:50:58 2005 UTC revision 1.164 by bosk, Tue May 31 20:54:30 2005 UTC
# Line 470  reap_children (int block, int err) Line 470  reap_children (int block, int err)
470        register struct child *lastc, *c;        register struct child *lastc, *c;
471        int child_failed;        int child_failed;
472        int any_remote, any_local;        int any_remote, any_local;
473          int dontcare;
474    
475        if (err && block)        if (err && block)
476          {          {
# Line 686  reap_children (int block, int err) Line 687  reap_children (int block, int err)
687        if (c->good_stdin)        if (c->good_stdin)
688          good_stdin_used = 0;          good_stdin_used = 0;
689    
690          dontcare = c->file->dontcare;
691    
692        if (child_failed && !c->noerror && !ignore_errors_flag)        if (child_failed && !c->noerror && !ignore_errors_flag)
693          {          {
694            /* The commands failed.  Write an error message,            /* The commands failed.  Write an error message,
695               delete non-precious targets, and abort.  */               delete non-precious targets, and abort.  */
696            static int delete_on_error = -1;            static int delete_on_error = -1;
697            child_error (c->file->name, exit_code, exit_sig, coredump, 0);  
698              if (!dontcare)
699                child_error (c->file->name, exit_code, exit_sig, coredump, 0);
700    
701            c->file->update_status = 2;            c->file->update_status = 2;
702            if (delete_on_error == -1)            if (delete_on_error == -1)
703              {              {
# Line 791  reap_children (int block, int err) Line 797  reap_children (int block, int err)
797    
798        /* If the job failed, and the -k flag was not given, die,        /* If the job failed, and the -k flag was not given, die,
799           unless we are already in the process of dying.  */           unless we are already in the process of dying.  */
800        if (!err && child_failed && !keep_going_flag &&        if (!err && child_failed && !dontcare && !keep_going_flag &&
801            /* fatal_error_signal will die with the right signal.  */            /* fatal_error_signal will die with the right signal.  */
802            !handling_fatal_signal)            !handling_fatal_signal)
803          die (2);          die (2);

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.164

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26