Module Name: src
Committed By: rillig
Date: Fri Dec 11 22:48:31 UTC 2020
Modified Files:
src/usr.bin/make: config.h main.c
Log Message:
make(1): remove DEFMAXLOCAL and DEFMAXJOBS
These have been hard-wired all the time. The word LOCAL doesn't make
sense anymore since the code for running jobs remotely has gone.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/config.h
cvs rdiff -u -r1.492 -r1.493 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/config.h
diff -u src/usr.bin/make/config.h:1.26 src/usr.bin/make/config.h:1.27
--- src/usr.bin/make/config.h:1.26 Sun Nov 29 09:27:40 2020
+++ src/usr.bin/make/config.h Fri Dec 11 22:48:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.26 2020/11/29 09:27:40 rillig Exp $ */
+/* $NetBSD: config.h,v 1.27 2020/12/11 22:48:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -73,19 +73,6 @@
*/
/*
- * DEFMAXJOBS
- * DEFMAXLOCAL
- * These control the default concurrency. On no occasion will more
- * than DEFMAXJOBS targets be created at once (locally or remotely).
- *
- * 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
-
-/*
* INCLUDES
* LIBRARIES
* These control the handling of the .INCLUDES and .LIBS variables.
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.492 src/usr.bin/make/main.c:1.493
--- src/usr.bin/make/main.c:1.492 Sat Dec 5 18:38:02 2020
+++ src/usr.bin/make/main.c Fri Dec 11 22:48:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.492 2020/12/05 18:38:02 rillig Exp $ */
+/* $NetBSD: main.c,v 1.493 2020/12/11 22:48:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,17 +109,13 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.492 2020/12/05 18:38:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.493 2020/12/11 22:48:31 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
"All rights reserved.");
#endif
-#ifndef DEFMAXLOCAL
-#define DEFMAXLOCAL DEFMAXJOBS
-#endif
-
CmdOpts opts;
time_t now; /* Time at start of make */
GNode *defaultNode; /* .DEFAULT node */
@@ -1128,7 +1124,7 @@ CmdOpts_Init(void)
opts.checkEnvFirst = FALSE;
Lst_Init(&opts.makefiles);
opts.ignoreErrors = FALSE; /* Pay attention to non-zero returns */
- opts.maxJobs = DEFMAXLOCAL; /* Set default local max concurrency */
+ opts.maxJobs = 1;
opts.keepgoing = FALSE; /* Stop on error */
opts.noRecursiveExecute = FALSE; /* Execute all .MAKE targets */
opts.noExecute = FALSE; /* Execute all commands */
