From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 6 Jun 2019 16:37:59 +0000 (-0700)
Subject: bpo-37156: Fix libssl DLL tag in MSI sources (GH-13866)
X-Git-Tag: v3.8.0b2~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c4084f4c13d7ec516abc0439288cbeb2c96489a;p=python

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

(cherry picked from commit e0c0c7e8c9f8153a54b92e43aa3d09e69a9fd0c0)

Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 0fe822af93..5da901c021 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>