Skip to content

fix: bootstrap uses the directory of the latest includes available under llvm_install_dir for --stdlib-includes #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2025
Merged

fix: bootstrap uses the directory of the latest includes available under llvm_install_dir for --stdlib-includes #976

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aa3ecb
fix: don't hard-code the value of `--stdlib-includes` in bootstrap.py
gennaroprota Aug 25, 2025
b66fe48
fix: cache the result of find_latest_clang_include_dir() in bootstrap.py
gennaroprota Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,6 +1678,17 @@ def install_mrdocs(self):
else:
print(f"\nMrDocs has been successfully installed in {self.options.mrdocs_install_dir}.\n")

@lru_cache(maxsize=1)
def find_latest_clang_include_dir(self):
parent = os.path.join(self.options.llvm_install_dir, "lib", "clang")
subdirs = [d for d in os.listdir(parent) if os.path.isdir(os.path.join(parent, d))]
numeric_subdirs = [d for d in subdirs if d.isdigit()]
if not numeric_subdirs:
raise RuntimeError(f"No numeric directories found in {parent}")
latest_numeric_subdir = max(numeric_subdirs, key=lambda d: int(d))

return os.path.join(parent, latest_numeric_subdir, "include")

def generate_clion_run_configs(self, configs):
import xml.etree.ElementTree as ET

Expand Down Expand Up @@ -2210,7 +2221,7 @@ def generate_run_configs(self):
f'--generator={generator}',
f'--addons={os.path.join(self.options.mrdocs_src_dir, "share", "mrdocs", "addons")}',
f'--stdlib-includes={os.path.join(self.options.llvm_install_dir, "include", "c++", "v1")}',
f'--stdlib-includes={os.path.join(self.options.llvm_install_dir, "lib", "clang", "20", "include")}',
f'--stdlib-includes={self.find_latest_clang_include_dir()}',
f'--libc-includes={os.path.join(self.options.mrdocs_src_dir, "share", "mrdocs", "headers", "libc-stubs")}',
'--log-level=warn'
]
Expand All @@ -2236,7 +2247,7 @@ def generate_run_configs(self):
f'--generator=adoc',
f'--addons={os.path.join(self.options.mrdocs_src_dir, "share", "mrdocs", "addons")}',
f'--stdlib-includes={os.path.join(self.options.llvm_install_dir, "include", "c++", "v1")}',
f'--stdlib-includes={os.path.join(self.options.llvm_install_dir, "lib", "clang", "20", "include")}',
f'--stdlib-includes={self.find_latest_clang_include_dir()}',
f'--libc-includes={os.path.join(self.options.mrdocs_src_dir, "share", "mrdocs", "headers", "libc-stubs")}',
f'--tagfile=reference.tag.xml',
'--multipage=true',
Expand All @@ -2260,7 +2271,7 @@ def generate_run_configs(self):
f'--generator=adoc',
f'--addons={os.path.join(self.options.mrdocs_src_dir, "share", "mrdocs", "addons")}',
f'--stdlib-includes={os.path.join(self.options.llvm_install_dir, "include", "c++", "v1")}',
f'--stdlib-includes={os.path.join(self.options.llvm_install_dir, "lib", "clang", "20", "include")}',
f'--stdlib-includes={self.find_latest_clang_include_dir()}',
f'--libc-includes={os.path.join(self.options.mrdocs_src_dir, "share", "mrdocs", "headers", "libc-stubs")}',
f'--tagfile=reference.tag.xml',
'--multipage=true',
Expand Down
Loading