Skip to content

GH-146210: Fix building the jit stencils on Windows when the interpreter is built with a different clang version #146338

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

Open
chris-eibl wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

GH-146210: Fix building the jit stencils on Windows when the interpreter is built with a different clang version #146338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2026-03-23-20-06-35.gh-issue-146210.C01Rmq.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix building the jit stencils on Windows when the interpreter is built with
a different clang version. Patch by Chris Eibl.
19 changes: 18 additions & 1 deletion Tools/jit/_llvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,26 @@ async def _run(tool: str, args: typing.Iterable[str], echo: bool = False) -> str
async with _CORES:
if echo:
print(shlex.join(command))

if os.name == "nt":
env = os.environ.copy()
try:
# https://github.com/python/cpython/issues/146210
# When the Python iterpreter is built with
# "/p:PlatformToolset=ClangCL" "/p:LLVMInstallDir=...""
# msbuild populates the INCLUDE variable based on this
# clang version, which might be different to the one used
# for building the jit stencils. Mixing those include paths
# can cause mysterious build errors, so we remove the
# variable from the environment when invoking LLVM tools.
del env["INCLUDE"]
except KeyError:
pass
else:
env = None
try:
process = await asyncio.create_subprocess_exec(
*command, stdout=subprocess.PIPE
*command, stdout=subprocess.PIPE, env=env
)
except FileNotFoundError:
return None
Expand Down
Loading