summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-05-01 18:15:16 +0300
committerEli Zaretskii <eliz@gnu.org>2013-05-01 18:15:16 +0300
commita87ff20158eead839d9457e240934bdc05ba509d (patch)
tree86ad0e5b0f0f291edfaad4c7d78826cff482d162
parent9acb657eb18a35a920fa24615e5f80060e656e72 (diff)
downloadgunmake-a87ff20158eead839d9457e240934bdc05ba509d.tar.gz
job.c (start_job_command) [WINDOWS32]: Make the same fix for
MS-Windows as the previous commit did for Posix platforms.
-rw-r--r--ChangeLog5
-rw-r--r--job.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 148ca6a..cfd59f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-01 Eli Zaretskii <eliz@gnu.org>
+
+ * job.c (start_job_command) [WINDOWS32]: Make the same fix for
+ MS-Windows as the previous commit did for Posix platforms.
+
2013-05-01 Paul Smith <psmith@gnu.org>
* job.c (start_job_command): Don't redirect output for recursive
diff --git a/job.c b/job.c
index 2488808..5b626b1 100644
--- a/job.c
+++ b/job.c
@@ -1857,8 +1857,10 @@ start_job_command (struct child *child)
sync_Path_environment();
#ifdef OUTPUT_SYNC
- /* Divert child output into tempfile(s) if output_sync in use. */
- if (output_sync)
+ /* Divert child output if output_sync in use. Don't capture
+ recursive make output unless we are synchronizing "make" mode. */
+ if (output_sync && (output_sync == OUTPUT_SYNC_MAKE
+ || !(flags & COMMANDS_RECURSE)))
hPID = process_easy(argv, child->environment,
child->outfd, child->errfd);
else