summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--job.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/job.c b/job.c
index 4337935..666c0d7 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')