Module Name: src
Committed By: sjg
Date: Tue Apr 5 04:25:43 UTC 2016
Modified Files:
src/usr.bin/make: main.c
Log Message:
Skip looking for .MAKE.JOBS if either of compatMake or forceJob is true.
If -B compatMake will be true and should be honored.
If -j forceJobs will be true and the command line supplied .MAKE.JOBS
should be respected - for consistency with other usage.
To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.243 src/usr.bin/make/main.c:1.244
--- src/usr.bin/make/main.c:1.243 Wed Mar 16 16:04:44 2016
+++ src/usr.bin/make/main.c Tue Apr 5 04:25:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $ */
+/* $NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $");
+__RCSID("$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1232,7 +1232,8 @@ main(int argc, char **argv)
Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &p1), VAR_GLOBAL);
free(p1);
- if (Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) {
+ if (!forceJobs && !compatMake &&
+ Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) {
char *value;
int n;
