From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 1 May 2013 15:15:16 +0000 (+0300)
Subject: job.c (start_job_command) [WINDOWS32]: Make the same fix for
X-Git-Tag: 3.99.90~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a87ff20158eead839d9457e240934bdc05ba509d;p=thirdparty%2Fmake.git

job.c (start_job_command) [WINDOWS32]: Make the same fix for
 MS-Windows as the previous commit did for Posix platforms.
---

diff --git a/ChangeLog b/ChangeLog
index 148ca6a9..cfd59f79 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 24888080..5b626b15 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