diff options
Diffstat (limited to '.travis/run.sh')
| -rwxr-xr-x | .travis/run.sh | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index bda9b545..178dfc20 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -9,22 +9,14 @@ if [[ "$(uname -s)" == "Darwin" ]]; then PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" - if [[ "${OPENSSL}" != "0.9.8" ]]; then - # set our flags to use homebrew openssl - export ARCHFLAGS="-arch x86_64" - # if the build is static we need different LDFLAGS - 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" - fi - export CFLAGS="-I/usr/local/opt/openssl/include" - # The Travis OS X jobs are run for two versions - # of OpenSSL, but we only need to run the - # CommonCrypto backend tests once. Exclude - # CommonCrypto when we test against brew OpenSSL - export TOX_FLAGS="--backend=openssl" + # set our flags to use homebrew openssl + # if the build is static we need different LDFLAGS + 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" fi + export CFLAGS="-I/usr/local/opt/openssl/include" else if [[ "${TOXENV}" == "pypy" ]]; then PYENV_ROOT="$HOME/.pyenv" |