diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-07-24 19:05:15 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-07-24 19:05:15 -0400 |
| commit | 268b0ed4b9518604ca28b40a30488ff989932017 (patch) | |
| tree | df4320c3e317f66ac893acde3e36f738fee8dcbd /src/_cffi_src | |
| parent | b095374c64a413f8569a6b34883655d7a230a5c8 (diff) | |
| parent | 6608b7e98e6669404c981ad981c277767998f129 (diff) | |
| download | cryptography-268b0ed4b9518604ca28b40a30488ff989932017.tar.gz cryptography-268b0ed4b9518604ca28b40a30488ff989932017.tar.bz2 cryptography-268b0ed4b9518604ca28b40a30488ff989932017.zip | |
Merge pull request #2174 from reaperhulk/remove-windows-link-type
remove windows link type, update docs
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index dac3e4d8..6a5bf2da 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -4,7 +4,6 @@ from __future__ import absolute_import, division, print_function -import os import sys from _cffi_src.utils import build_ffi_for_binding, extra_link_args @@ -19,20 +18,8 @@ def _get_openssl_libraries(platform): # (http://marc.info/?l=openssl-users&m=135361825921871) return ["ssl", "crypto"] else: - link_type = os.environ.get("PYCA_WINDOWS_LINK_TYPE", "static") - return _get_openssl_windows_libraries(link_type) - - -def _get_openssl_windows_libraries(link_type): - if link_type == "dynamic": - return ["libeay32", "ssleay32", "advapi32"] - elif link_type == "static" or link_type == "": - return ["libeay32mt", "ssleay32mt", "advapi32", + return ["libeay32", "ssleay32", "advapi32", "crypt32", "gdi32", "user32", "ws2_32"] - else: - raise ValueError( - "PYCA_WINDOWS_LINK_TYPE must be 'static' or 'dynamic'" - ) _OSX_PRE_INCLUDE = """ |