Fix the fix for bin/72510 applied in job.c:1.70. Actually there have

been two maxJobs variables: one static in job.c and one global used in
main.c and parse.c. Makeing one global out of these was the wrong way
to fix the problem. Instead rename the global one to jobLimit and keep
maxJobs static in job.c.

Suggested by:	rwatson
PR:		bin/72510

1 files changed, 6 insertions, 1 deletions

diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index f5b555b..279fb66 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -400,7 +400,12 @@ static struct Shell *commandShell = NULL;
 static char	*shellPath = NULL;	/* full pathname of executable image */
 static char	*shellName = NULL;	/* last component of shell */
 
-int		maxJobs;	/* The most children we can run at once */
+/*
+ * The maximum number of jobs that may run. This is initialize from the
+ * -j argument for the leading make and from the FIFO for sub-makes.
+ */
+static int	maxJobs;
+
 static int	nJobs;		/* The number of children currently running */
 
 /* The structures that describe them */