diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-31 12:34:30 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-31 13:30:12 -0500 |
| commit | 7402cf1c676ffb7ba48d6e90227bb4b1397af12d (patch) | |
| tree | 2f0c37ebbb284bf4ce795e8b824dfe9b2554c4ee | |
| parent | 7539dcb6e424e27f6bb270571b9410bd6ad36aac (diff) | |
| download | cryptography-7402cf1c676ffb7ba48d6e90227bb4b1397af12d.tar.gz cryptography-7402cf1c676ffb7ba48d6e90227bb4b1397af12d.tar.bz2 cryptography-7402cf1c676ffb7ba48d6e90227bb4b1397af12d.zip | |
rename env var to CRYPTOGRAPHY_OSX_NO_LINK_FLAGS
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rwxr-xr-x | .travis/run.sh | 2 | ||||
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index bd039065..f1c3567d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,27 +71,27 @@ matrix: - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py26 CRYPTOGRAPHY_BUILD_STATIC=1 + env: TOXENV=py26 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py27 CRYPTOGRAPHY_BUILD_STATIC=1 + env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py33 CRYPTOGRAPHY_BUILD_STATIC=1 + env: TOXENV=py33 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py34 CRYPTOGRAPHY_BUILD_STATIC=1 + env: TOXENV=py34 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=pypy CRYPTOGRAPHY_BUILD_STATIC=1 + env: TOXENV=pypy CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx osx_image: beta-xcode6.3 - env: TOXENV=py27 CRYPTOGRAPHY_BUILD_STATIC=0 + env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=0 - language: generic os: osx osx_image: beta-xcode6.3 diff --git a/.travis/run.sh b/.travis/run.sh index c22ded22..1ce8011f 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -9,7 +9,7 @@ if [[ "$(uname -s)" == "Darwin" ]]; then # set our flags to use homebrew openssl export ARCHFLAGS="-arch x86_64" # if the build is static we need different LDFLAGS - if [[ "${CRYPTOGRAPHY_BUILD_STATIC}" == "1" ]]; then + if [[ "${CRYPTOGRAPHY_OSX_NO_LINK_FLAGS}" == "1" ]]; then export LDFLAGS="/usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a" else export LDFLAGS="-L/usr/local/opt/openssl/lib" diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index 49d7464c..defa69d3 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -14,7 +14,7 @@ def _get_openssl_libraries(platform): # OpenSSL goes by a different library name on different operating systems. if platform == "darwin": return _osx_libraries( - os.environ.get("CRYPTOGRAPHY_BUILD_STATIC") + os.environ.get("CRYPTOGRAPHY_OSX_NO_LINK_FLAGS") ) elif platform == "win32": return ["libeay32", "ssleay32", "advapi32", |