From: Steve Dower <steve.dower@python.org>
Date: Wed, 19 Jun 2019 01:05:33 +0000 (-0700)
Subject: bpo-37156: Fix libssl DLL tag in MSI sources (GH-14219)
X-Git-Tag: v3.7.4rc2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ad5e9edea08b0d377902d556624f03a2b8bb29b;p=thirdparty%2FPython%2Fcpython.git

bpo-37156: Fix libssl DLL tag in MSI sources (GH-14219)
---

diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 0fe822af9319..5da901c0215a 100644
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -87,15 +87,16 @@
             PyArchExt=$(PyArchExt);
             PyTestExt=$(PyTestExt);
             OptionalFeatureName=$(OutputName);
+            ssltag=-1_1;
         </DefineConstants>
         <DefineConstants Condition="'$(CRTRedist)' != ''">
             $(DefineConstants);CRTRedist=$(CRTRedist);
         </DefineConstants>
         <DefineConstants Condition="$(Platform) != 'x64'">
-            $(DefineConstants);Suffix32=-32;ssltag=-1_1;
+            $(DefineConstants);Suffix32=-32;
         </DefineConstants>
         <DefineConstants Condition="$(Platform) == 'x64'">
-            $(DefineConstants);Suffix32=;ssltag=-1_1-x64;
+            $(DefineConstants);Suffix32=;
         </DefineConstants>
     </PropertyGroup>