From c3b8d73208a25735b6355de73297a51e9c1306b3 Mon Sep 17 00:00:00 2001
From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
Date: Tue, 25 Mar 2025 00:15:51 +0100
Subject: [PATCH] GH-131473: Override PreferredToolArchitecture when using
 Visual Studio bundled clang-cl (GH-131689)

tweak PreferredToolArchitecture for bundled clang-cl
---
 PCbuild/python.props | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 5a3fae0e2f69..d1c4b5bda6c3 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.
-- 
2.47.3