From: Roland McGrath <roland@redhat.com>
Date: Mon, 24 Oct 1994 22:50:01 +0000 (+0000)
Subject: (start_job_command): In FLAGS initialization, OR in
X-Git-Tag: 3.71.5~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc8d6cf343ad91528bba436775070727a5e88935;p=thirdparty%2Fmake.git

(start_job_command): In FLAGS initialization, OR in
CHILD->file->command_flags.
---

diff --git a/job.c b/job.c
index 43379357..666c0d79 100644
--- a/job.c
+++ b/job.c
@@ -529,9 +529,14 @@ start_job_command (child)
 {
   static int bad_stdin = -1;
   register char *p;
-  int flags = child->file->cmds->lines_flags[child->command_line - 1];
+  int flags;
   char **argv;
 
+  /* Combine the flags parsed for the line itself with
+     the flags specified globally for this target.  */
+  flags = (child->file->command_flags
+	   | child->file->cmds->lines_flags[child->command_line - 1]);
+
   p = child->command_ptr;
   child->noerror = flags & COMMANDS_NOERROR;
   while (*p != '\0')