commit 7402cf1c676ffb7ba48d6e90227bb4b1397af12d
author Paul Kehrer <paul.l.kehrer@gmail.com> Mon Aug 31 12:34:30 2015 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Mon Aug 31 13:30:12 2015 -0500
tree 2f0c37ebbb284bf4ce795e8b824dfe9b2554c4ee
parent 7539dcb6e424e27f6bb270571b9410bd6ad36aac

rename env var to CRYPTOGRAPHY_OSX_NO_LINK_FLAGS

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index bd03906..f1c3567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,27 +71,27 @@
         - 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

.travis/run.sh

diff --git a/.travis/run.sh b/.travis/run.sh
index c22ded2..1ce8011 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -9,7 +9,7 @@
         # 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"

src/_cffi_src/build_openssl.py

diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py
index 49d7464..defa69d 100644
--- a/src/_cffi_src/build_openssl.py
+++ b/src/_cffi_src/build_openssl.py
@@ -14,7 +14,7 @@
     # 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",