Skip to content

GH-131473: tweak PreferredToolArchitecture for bundled clang-cl #131689

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
Mar 24, 2025
Merged

GH-131473: tweak PreferredToolArchitecture for bundled clang-cl #131689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b8d034
tweak PreferredToolArchitecture for bundled clang-cl
chris-eibl Mar 24, 2025
b7866e3
Merge remote-tracking branch 'origin/main' into PreferredToolArchitec…
chris-eibl Mar 24, 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
10 changes: 10 additions & 0 deletions PCbuild/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading