[src/trunk]: src/usr.bin/make Skip looking for .MAKE.JOBS if either of compat...

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a3fb2945c72d
branches:  trunk
changeset: 344575:a3fb2945c72d
user:      sjg <sjg%NetBSD.org@localhost>
date:      Tue Apr 05 04:25:43 2016 +0000

description:
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.

diffstat:

 usr.bin/make/main.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 719260b081ab -r a3fb2945c72d usr.bin/make/main.c
--- a/usr.bin/make/main.c       Tue Apr 05 00:48:53 2016 +0000
+++ b/usr.bin/make/main.c       Tue Apr 05 04:25:43 2016 +0000
@@ -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 @@
 #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 @@
        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;