diff options
| author | Steve Dower <steve.dower@python.org> | 2022-01-28 16:48:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 16:48:06 (GMT) |
| commit | 45faf151c693b6f13f78926761caea6df7242024 (patch) | |
| tree | 8e45001c8431c55aba7a03015e8e449361b3d4c0 /PCbuild/openssl.props | |
| parent | db77bcd6092f3c174ae855522411ab83854d65a8 (diff) | |
| download | cpython-45faf151c693b6f13f78926761caea6df7242024.zip cpython-45faf151c693b6f13f78926761caea6df7242024.tar.gz cpython-45faf151c693b6f13f78926761caea6df7242024.tar.bz2 | |
bpo-33125: Enables building traditional installer for Windows ARM64 (GH-30885)
Also makes a few general improvements to the build process and removes some dead code.
Diffstat (limited to 'PCbuild/openssl.props')
| -rw-r--r-- | PCbuild/openssl.props | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index a7e1679..6081d3c 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -13,6 +13,7 @@ <_DLLSuffix>-1_1</_DLLSuffix> <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix> <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix> + <OpenSSLDLLSuffix>$(_DLLSuffix)</OpenSSLDLLSuffix> </PropertyGroup> <ItemGroup> <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" /> @@ -20,10 +21,14 @@ <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" /> <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" /> </ItemGroup> - <Target Name="_CopySSLDLL" Inputs="@(_SSLDLL)" Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build"> + <Target Name="_CopySSLDLL" + Inputs="@(_SSLDLL)" + Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" + Condition="$(SkipCopySSLDLL) == ''" + AfterTargets="Build"> <Copy SourceFiles="@(_SSLDLL)" DestinationFolder="$(OutDir)" /> </Target> - <Target Name="_CleanSSLDLL" BeforeTargets="Clean"> + <Target Name="_CleanSSLDLL" Condition="$(SkipCopySSLDLL) == ''" BeforeTargets="Clean"> <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" /> </Target> </Project>
\ No newline at end of file |