From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 8 Feb 2024 22:15:58 +0000 (+0100)
Subject: gh-115167: Exclude vcruntime140_threads.dll from Windows build output (GH-115176)
X-Git-Tag: v3.12.3~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=235c54fe9caa9a6f8525ce187ca056139e7601ac;p=thirdparty%2FPython%2Fcpython.git

gh-115167: Exclude vcruntime140_threads.dll from Windows build output (GH-115176)

(cherry picked from commit 5914a211ef5542edd1f792c2684e373a42647b04)

Co-authored-by: adang1345 <adang1345@gmail.com>
---

diff --git a/Misc/NEWS.d/next/Build/2024-02-08-19-36-20.gh-issue-115167.LB9nDK.rst b/Misc/NEWS.d/next/Build/2024-02-08-19-36-20.gh-issue-115167.LB9nDK.rst
new file mode 100644
index 000000000000..c60c4a93fe89
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2024-02-08-19-36-20.gh-issue-115167.LB9nDK.rst
@@ -0,0 +1 @@
+Avoid vendoring ``vcruntime140_threads.dll`` when building with Visual Studio 2022 version 17.8.
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 056ab2b3b664..cf959369c20d 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -236,7 +236,7 @@ public override bool Execute() {
       <VCRuntimeDLL Include="$(VCRuntimeDLL)" />
     </ItemGroup>
     <ItemGroup Condition="$(VCInstallDir) != '' and $(VCRuntimeDLL) == ''">
-      <VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
+      <VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" Exclude="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*_threads.dll" />
     </ItemGroup>
 
     <Warning Text="vcruntime*.dll not found under $(VCRedistDir)." Condition="@(VCRuntimeDLL) == ''" />