diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-03-03 00:30:18 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-03 00:30:18 (GMT) |
commit | 0d20364b132014eec609b900997c34779a4d548c (patch) | |
tree | d80958474b5a2a4e395e5d1024a5474f84f00165 /PCbuild | |
parent | 9ddcb914f9c2debe7c1359b2450cd1573e86b91c (diff) | |
download | cpython-0d20364b132014eec609b900997c34779a4d548c.zip cpython-0d20364b132014eec609b900997c34779a4d548c.tar.gz cpython-0d20364b132014eec609b900997c34779a4d548c.tar.bz2 |
bpo-38597: Never statically link extension initialization code on Windows (GH-18724)
(cherry picked from commit ce3a4984089b8e0ce5422ca32d75ad057b008074)
Co-authored-by: Steve Dower <steve.dower@python.org>
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/pythoncore.vcxproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 13c3b59..bd16c1e 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -528,6 +528,8 @@ <VCRuntimeDLL Include="$(VCRedistDir)\**\vcruntime*.dll" /> </ItemGroup> <Target Name="_CopyVCRuntime" AfterTargets="Build" Inputs="@(VCRuntimeDLL)" Outputs="$(OutDir)%(Filename)%(Extension)"> + <!-- bpo-38597: When we switch to another VCRuntime DLL, include vcruntime140.dll as well --> + <Warning Text="A copy of vcruntime140.dll is also required" Condition="!$(VCToolsRedistVersion.StartsWith(`14.`))" /> <Copy SourceFiles="%(VCRuntimeDLL.FullPath)" DestinationFolder="$(OutDir)" /> </Target> <Target Name="_CleanVCRuntime" AfterTargets="Clean"> |