]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-115167: Exclude vcruntime140_threads.dll from Windows build output (GH-115176)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 8 Feb 2024 22:15:58 +0000 (23:15 +0100)
committerGitHub <noreply@github.com>
Thu, 8 Feb 2024 22:15:58 +0000 (22:15 +0000)
(cherry picked from commit 5914a211ef5542edd1f792c2684e373a42647b04)

Co-authored-by: adang1345 <adang1345@gmail.com>
Misc/NEWS.d/next/Build/2024-02-08-19-36-20.gh-issue-115167.LB9nDK.rst [new file with mode: 0644]
PCbuild/pyproject.props

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 (file)
index 0000000..c60c4a9
--- /dev/null
@@ -0,0 +1 @@
+Avoid vendoring ``vcruntime140_threads.dll`` when building with Visual Studio 2022 version 17.8.
index 056ab2b3b6643a0579a6b472360669d2ef52f2ab..cf959369c20db1a21bc8cc2bed2ccb596643161b 100644 (file)
@@ -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) == ''" />