diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-06-19 20:08:58 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-06-19 20:08:58 (GMT) |
| commit | 81fdd0b86855062687290352f63e3c6cf6131a22 (patch) | |
| tree | dfc97503e23b9a9a47fa8183762707d4f476d24c /PCbuild | |
| parent | 72dd5227614746d5965c302d901dbb3384947fbd (diff) | |
| parent | 6d58f8dc525f2bdf7e6d4d2b4ce1e63a6a166940 (diff) | |
| download | cpython-81fdd0b86855062687290352f63e3c6cf6131a22.zip cpython-81fdd0b86855062687290352f63e3c6cf6131a22.tar.gz cpython-81fdd0b86855062687290352f63e3c6cf6131a22.tar.bz2 | |
Issue 24476: Statically links vcruntime140.dll and removes it from the installer
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.props | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 1afbfe1..d8f39e4 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -32,7 +32,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <ExceptionHandling></ExceptionHandling> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -43,7 +43,7 @@ <ClCompile Condition="$(Configuration) == 'Debug'"> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -53,7 +53,9 @@ <RandomizedBaseAddress>true</RandomizedBaseAddress> <DataExecutionPrevention>true</DataExecutionPrevention> <SuppressStartupBanner>true</SuppressStartupBanner> - <IgnoreSpecificDefaultLibraries>LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <AdditionalDependencies Condition="$(Configuration) == 'Debug'">ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies Condition="$(Configuration) != 'Debug'">ucrt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <IgnoreSpecificDefaultLibraries>LIBC;libucrt.lib;libucrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <TargetMachine>MachineX86</TargetMachine> <TargetMachine Condition="'$(Platform)' == 'x64'">MachineX64</TargetMachine> <ProfileGuidedDatabase Condition="$(SupportPGO)">$(OutDir)$(TargetName).pgd</ProfileGuidedDatabase> |