system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-11-05 18:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better fix, as originally submitted by reporter.

Browse source 
Submitted by:	 N.Dudorov <nnd@itfs.nsk.su>
This commit is contained in:
Steve Passe 1997-08-14 19:24:11 +00:00
parent b7abf69c86
commit 6e0d2d5172
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=28228
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
usr.bin/make/main.c
View file

@ -47,7 +47,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#endif
static const char rcsid[] =
"$Id: main.c,v 1.18 1997/07/24 06:58:06 charnier Exp $";
"$Id: main.c,v 1.1 1997/08/13 23:36:11 smp Exp smp $";
#endif /* not lint */
/*-
@ -118,6 +118,7 @@ static Lst makefiles; /* ordered list of makefiles to read */
static Boolean printVars; /* print value of one or more vars */
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 */
@ -162,7 +163,6 @@ MainParseArgs(argc, argv)
extern int optind;
extern char *optarg;
int c;
int forceJobs = 0;
optind = 1; /* since we're called more than once */
#ifdef REMOTE
@ -337,13 +337,6 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
}
(void)Lst_AtEnd(create, (ClientData)estrdup(*argv));
}
/*
* Be compatible if user did not specify -j and did not explicitly
* turned compatibility on
*/
if (!compatMake && !forceJobs)
compatMake = TRUE;
}
/*-
@ -559,6 +552,7 @@ main(argc, argv)
#else
maxJobs = maxLocal;
#endif
forceJobs = FALSE; /* No -j flag */
compatMake = FALSE; /* No compat mode */
@ -606,6 +600,13 @@ main(argc, argv)
MainParseArgs(argc, argv);
/*
* Be compatible if user did not specify -j and did not explicitly
* turned compatibility on
*/
if (!compatMake && !forceJobs)
compatMake = TRUE;
/*
* Initialize archive, target and suffix modules in preparation for
* parsing the makefile(s)