d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of now unused maxLocal variables.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2004-11-11 12:23:39 +00:00
parent 033b92f386
commit 84f3c4931b
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/make/config.h
View File

@ -42,15 +42,10 @@
/*
* DEFMAXJOBS
* DEFMAXLOCAL
* These control the default concurrency. On no occasion will more
* This control the default concurrency. On no occasion will more
* than DEFMAXJOBS targets be created at once.
* DEFMAXLOCAL is the highest number of targets which will be
* created on the local machine at once. Note that if you set this
* to 0, nothing will ever happen...
*/
#define DEFMAXJOBS 4
#define DEFMAXLOCAL 1
#define DEFMAXJOBS 1
/*
* INCLUDES

13
usr.bin/make/main.c
View File

@ -91,10 +91,6 @@ __FBSDID("$FreeBSD$");
#define WANT_ENV_MKLVL 1
#ifndef DEFMAXLOCAL
#define DEFMAXLOCAL DEFMAXJOBS
#endif /* DEFMAXLOCAL */
#define MAKEFLAGS ".MAKEFLAGS"
Lst create; /* Targets to be made */
@ -108,7 +104,6 @@ static Boolean expandVars; /* fully expand printed variables */
static Lst variables; /* list of variables to print */
int maxJobs; /* -j argument */
static Boolean forceJobs; /* -j argument given */
static int maxLocal; /* -L argument */
Boolean compatMake; /* -B argument */
Boolean debug; /* -d flag */
Boolean noExecute; /* -n flag */
@ -284,7 +279,6 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
optarg);
usage();
}
maxLocal = maxJobs;
MFLAGS_append("-j", optarg);
break;
}
@ -578,8 +572,7 @@ main(int argc, char **argv)
debug = 0; /* No debug verbosity, please. */
jobsRunning = FALSE;
maxLocal = DEFMAXLOCAL; /* Set default local max concurrency */
maxJobs = maxLocal;
maxJobs = DEFMAXJOBS;
forceJobs = FALSE; /* No -j flag */
compatMake = FALSE; /* No compat mode */
@ -859,9 +852,7 @@ main(int argc, char **argv)
* being executed should it exist).
*/
if (!queryFlag) {
if (maxLocal == -1)
maxLocal = maxJobs;
Job_Init(maxJobs, maxLocal);
Job_Init(maxJobs, maxJobs);
jobsRunning = TRUE;
}