* Fixed error rebuilding makefiles with -j>1

* Fixed problem with job pipe and -j>1 when waiting on -l loads.

1 files changed, 3 insertions, 2 deletions

diff --git a/job.c b/job.c
index 787678d..caabb1e 100644
--- a/job.c
+++ b/job.c
@@ -1133,8 +1133,9 @@ start_waiting_job (c)
     {
 #ifdef MAKE_JOBSERVER
       /* If this is not a recurse command and we are controlling
-	 multiple jobs, obtain a token before starting child. */
-      if (job_fds[0] >= 0 && !f->cmds->any_recurse)
+	 multiple jobs, and we don't yet have one, obtain a token before
+         starting child. */
+      if (job_fds[0] >= 0 && !f->cmds->any_recurse && !c->job_token)
 	{
 	  fd_set rfds;