diff options
| author | Akira Yokosawa <akiyks@gmail.com> | 2025-10-19 17:24:51 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2025-10-29 18:48:21 +0300 |
| commit | 1f6e3f2139823a76dd0e45581ac777c8285227bb (patch) | |
| tree | c8c7ee0f1f3c9898ef590a4e2b7c33e8a70c308f /tools/docs/sphinx-build-wrapper | |
| parent | 0aa760051f4eb3d3bcd812125557bd09629a71e8 (diff) | |
| download | linux-1f6e3f2139823a76dd0e45581ac777c8285227bb.tar.xz | |
tools/docs/sphinx-build-wrapper: Emit $SPHINXOPTS later in args list
The option list to sphinx-build via SPHINXOPTS should have higher
priority than those the wrapper comes up with.
sphinx-build will choose the latest one if there are duplicates.
To restore the behavior of Makefile era, when the documentation builds
at https://www.kernel.org/doc/html/next/ had been depending on it,
reorder the flag list.
Reported-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Closes: https://lore.kernel.org/20251007-awesome-guan-of-greatness-e6ec75@lemur/
Reported-by: Akira Yokosawa <akiyks@gmail.com>
Closes: https://lore.kernel.org/c35e690f-0579-49cb-850c-07af98e5253a@gmail.com/
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Message-ID: <eaf4bfd8-fb80-45d0-b3ec-4047692ebbed@gmail.com>
Diffstat (limited to 'tools/docs/sphinx-build-wrapper')
| -rwxr-xr-x | tools/docs/sphinx-build-wrapper | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/docs/sphinx-build-wrapper b/tools/docs/sphinx-build-wrapper index 3e6d166d4102..1efaca3d16aa 100755 --- a/tools/docs/sphinx-build-wrapper +++ b/tools/docs/sphinx-build-wrapper @@ -298,8 +298,8 @@ class SphinxBuilder: cmd += [sphinx_build] cmd += [f"-j{n_jobs}"] - cmd += self.sphinxopts cmd += build_args + cmd += self.sphinxopts if self.verbose: print(" ".join(cmd)) |