From 1f6e3f2139823a76dd0e45581ac777c8285227bb Mon Sep 17 00:00:00 2001 From: Akira Yokosawa Date: Sun, 19 Oct 2025 23:24:51 +0900 Subject: [PATCH] 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 Closes: https://lore.kernel.org/20251007-awesome-guan-of-greatness-e6ec75@lemur/ Reported-by: Akira Yokosawa Closes: https://lore.kernel.org/c35e690f-0579-49cb-850c-07af98e5253a@gmail.com/ Signed-off-by: Akira Yokosawa Signed-off-by: Jonathan Corbet Message-ID: --- tools/docs/sphinx-build-wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docs/sphinx-build-wrapper b/tools/docs/sphinx-build-wrapper index 3e6d166d41025..1efaca3d16aa9 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)) -- 2.47.3