mirror of
https://github.com/torvalds/linux.git
synced 2025-11-03 18:20:25 +02:00
adc10f5b0a
When there was no parallelism (no top-level -j arg and a pre-1.7
sphinx-build), the argument passed would be empty ("") instead of just
being missing, which would (understandably) badly confuse sphinx-build.
Fix this by removing the quotes.
Reported-by: Rafael J. Wysocki <rafael@kernel.org>
Fixes: 51e46c7a40 ("docs, parallelism: Rearrange how jobserver reservations are made")
Cc: stable@vger.kernel.org # v5.5 only
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
33 lines
876 B
Bash
33 lines
876 B
Bash
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
# Figure out if we should follow a specific parallelism from the make
|
|
# environment (as exported by scripts/jobserver-exec), or fall back to
|
|
# the "auto" parallelism when "-jN" is not specified at the top-level
|
|
# "make" invocation.
|
|
|
|
sphinx="$1"
|
|
shift || true
|
|
|
|
parallel="$PARALLELISM"
|
|
if [ -z "$parallel" ] ; then
|
|
# If no parallelism is specified at the top-level make, then
|
|
# fall back to the expected "-jauto" mode that the "htmldocs"
|
|
# target has had.
|
|
auto=$(perl -e 'open IN,"'"$sphinx"' --version 2>&1 |";
|
|
while (<IN>) {
|
|
if (m/([\d\.]+)/) {
|
|
print "auto" if ($1 >= "1.7")
|
|
}
|
|
}
|
|
close IN')
|
|
if [ -n "$auto" ] ; then
|
|
parallel="$auto"
|
|
fi
|
|
fi
|
|
# Only if some parallelism has been determined do we add the -jN option.
|
|
if [ -n "$parallel" ] ; then
|
|
parallel="-j$parallel"
|
|
fi
|
|
|
|
exec "$sphinx" $parallel "$@"
|