https://github.com/python/cpython/commit/c3b8d73208a25735b6355de73297a51e9c1306b3
commit: c3b8d73208a25735b6355de73297a51e9c1306b3
branch: main
author: Chris Eibl <[email protected]>
committer: zooba <[email protected]>
date: 2025-03-24T23:15:51Z
summary:
GH-131473: Override PreferredToolArchitecture when using Visual Studio bundled
clang-cl (GH-131689)
tweak PreferredToolArchitecture for bundled clang-cl
files:
M PCbuild/python.props
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 5a3fae0e2f69fe..d1c4b5bda6c3d3 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -19,6 +19,16 @@
<ICCBuild>false</ICCBuild>
<ICCBuild Condition="$(PlatformToolset.StartsWith(`Intel C++
Compiler`))">true</ICCBuild>
+ <!--
+ This ensures, that in case of clang-cl bundled with VS
+ we find e.g. clang_rt.profile.lib in the correct bitness.
+ In case the user sets LLVMInstallDir and LLVMToolsVersion,
+ they are responsible to use the correct tool architecture.
+ For details please see GH-131473.
+ -->
+ <PreferredToolArchitecture Condition="$(LLVMInstallDir) == '' and
$(PlatformToolset) == 'ClangCL' and $(Platform) ==
'x64'">x64</PreferredToolArchitecture>
+ <PreferredToolArchitecture Condition="$(LLVMInstallDir) == '' and
$(PlatformToolset) == 'ClangCL' and $(Platform) ==
'Win32'">x86</PreferredToolArchitecture>
+
<!--
Convincing MSVC/MSBuild to prefer our platform names is too difficult,
so we define our own constant ArchName and use wherever we need it.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
