]> granicus.if.org Git - python/commitdiff
bpo-37156: Fix libssl DLL tag in MSI sources (GH-13866)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 6 Jun 2019 16:37:59 +0000 (09:37 -0700)
committerGitHub <noreply@github.com>
Thu, 6 Jun 2019 16:37:59 +0000 (09:37 -0700)
(cherry picked from commit e0c0c7e8c9f8153a54b92e43aa3d09e69a9fd0c0)

Co-authored-by: Steve Dower <steve.dower@python.org>
Tools/msi/msi.props

index 0fe822af93194b4ea6a837a692c1ed96de7b6aae..5da901c0215a2f92c880dfc93391eb1e0008d745 100644 (file)
             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>