torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools/docs: sphinx-build-wrapper: compute sphinxdirs_list earlier

Browse Source 
An upcoming patch will require sphinxdirs_list to be available before
the call to check_rust().

Move it up in the function.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tested-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Message-ID: <20260118-docs-spurious-rust-v1-3-998e14b9ed9e@weissschuh.net>
This commit is contained in:
Thomas Weißschuh
2026-01-18 00:26:23 +01:00
committed by Jonathan Corbet
parent 2d652135a1
commit 6f9a96cc96
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/docs/sphinx-build-wrapper
View File

@@ -670,6 +670,19 @@ class SphinxBuilder:
if kerneldoc.startswith(self.srctree):
kerneldoc = os.path.relpath(kerneldoc, self.srctree)
if not sphinxdirs:
sphinxdirs = os.environ.get("SPHINXDIRS", ".")
#
# sphinxdirs can be a list or a whitespace-separated string
#
sphinxdirs_list = []
for sphinxdir in sphinxdirs:
if isinstance(sphinxdir, list):
sphinxdirs_list += sphinxdir
else:
sphinxdirs_list += sphinxdir.split()
args = [ "-b", builder, "-c", docs_dir ]
if builder == "latex":
@@ -682,9 +695,6 @@ class SphinxBuilder:
if rustdoc:
args.extend(["-t", "rustdoc"])
if not sphinxdirs:
sphinxdirs = os.environ.get("SPHINXDIRS", ".")
#
# The sphinx-build tool has a bug: internally, it tries to set
# locale with locale.setlocale(locale.LC_ALL, ''). This causes a
@@ -695,16 +705,6 @@ class SphinxBuilder:
except locale.Error:
self.env["LC_ALL"] = "C"
#
# sphinxdirs can be a list or a whitespace-separated string
#
sphinxdirs_list = []
for sphinxdir in sphinxdirs:
if isinstance(sphinxdir, list):
sphinxdirs_list += sphinxdir
else:
sphinxdirs_list += sphinxdir.split()
#
# Step 1: Build each directory in separate.
#