summaryrefslogtreecommitdiffstats
path: root/Tools/msi
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-06-06 16:37:59 (GMT)
committerGitHub <noreply@github.com>2019-06-06 16:37:59 (GMT)
commit1c4084f4c13d7ec516abc0439288cbeb2c96489a (patch)
tree246c3413cc34236ceaa6349ce500646f87723a28 /Tools/msi
parent406284173a43f5c34643133e2f132ae15a071a23 (diff)
downloadcpython-1c4084f4c13d7ec516abc0439288cbeb2c96489a.zip
cpython-1c4084f4c13d7ec516abc0439288cbeb2c96489a.tar.gz
cpython-1c4084f4c13d7ec516abc0439288cbeb2c96489a.tar.bz2
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>
Diffstat (limited to 'Tools/msi')
-rw-r--r--Tools/msi/msi.props5
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 0fe822a..5da901c 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>