summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2023-04-02 10:29:37 -0400
committerPaul Smith <psmith@gnu.org>2023-04-02 10:29:37 -0400
commit54b3202f8da0761c7d5a3410313f0a32eb63ef8b (patch)
treea653108d17670cc08d74b231f465dce805075164 /src
parent5111087e120b3146aed8a958c38684f6d9d6c257 (diff)
downloadmake-git-54b3202f8da0761c7d5a3410313f0a32eb63ef8b.tar.gz
[SV 63981] Don't warn on explicit -j1
If -j1 is given explicitly on the command line don't warn about it. * src/main.c (main): Skip the warning if -j1. * tests/scripts/features/jobserver: Add a test for this behavior.
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 5d6b9e76..8587de61 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1830,7 +1830,7 @@ main (int argc, char **argv, char **envp)
/* The user provided a -j setting on the command line so use it: we're
the master make of a new jobserver group. */
- else if (!restarts)
+ else if (!restarts && argv_slots != 1)
ON (error, NILF,
_("warning: -j%d forced in submake: resetting jobserver mode"),
argv_slots);