diff options
| author | Paul Smith <psmith@gnu.org> | 2016-04-04 01:23:04 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2016-04-04 01:38:37 -0400 |
| commit | 5bd7ad2b225bf9229ca96ba63b90f8094a2becde (patch) | |
| tree | 8ed6e632aa28ee2b56f6d8366f69d1f37c8c71c5 /doc | |
| parent | 65115e7095e1232e590c8920e7f828706a67fa4a (diff) | |
| download | make-git-5bd7ad2b225bf9229ca96ba63b90f8094a2becde.tar.gz | |
Preserve the real value of -jN in MAKEFLAGS using jobserver.
Previously if the jobserver was active, MAKEFLAGS would contain only
the -j option but not the number (not -j5 or whatever) so users
could not discover that value. Allow that value to be provided in
MAKEFLAGS without error but still give warnings if -jN is provided
on the command line if the jobserver is already activated.
* NEWS: Discuss the new behavior.
* os.h, posixos.c, w32/w32os.c: Return success/failure from
jobserver_setup() and jobserver_parse_auth().
* main.c (main): Separate the command line storage of job slots (now
in arg_job_slots) from the control storage (in job_slots). Make a
distinction between -jN flags read from MAKEFLAGS and those seen
on the command line: for the latter if the jobserver is enabled then
warn and disable it, as before.
* tests/scripts/features/jobserver: Add new testing.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/make.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/make.texi b/doc/make.texi index b4ce44ae..2dc907a3 100644 --- a/doc/make.texi +++ b/doc/make.texi @@ -4721,9 +4721,9 @@ doesn't count against the total jobs (otherwise we could get @samp{N} sub-@code{make}s running and have no slots left over for any real work!) If your operating system doesn't support the above communication, then -@samp{-j 1} is always put into @code{MAKEFLAGS} instead of the value you -specified. This is because if the @w{@samp{-j}} option were passed down -to sub-@code{make}s, you would get many more jobs running in parallel +no @samp{-j} is added to @code{MAKEFLAGS}, so that sub-@code{make}s +run in non-parallel mode. If the @w{@samp{-j}} option were passed down +to sub-@code{make}s you would get many more jobs running in parallel than you asked for. If you give @samp{-j} with no numeric argument, meaning to run as many jobs as possible in parallel, this is passed down, since multiple infinities are no more than one.@refill |