diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-06-06 18:31:02 -1000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-06-07 00:31:02 -0400 |
| commit | 8ba4756af921b471ae3533d23fdaa988c851ad54 (patch) | |
| tree | ef38c4ef6db7af42fc032847fd58f9ed7d06e0a8 /.travis | |
| parent | 6bdae781917dfd7e013e85a5435ff44bef702df2 (diff) | |
| download | cryptography-8ba4756af921b471ae3533d23fdaa988c851ad54.tar.gz cryptography-8ba4756af921b471ae3533d23fdaa988c851ad54.tar.bz2 cryptography-8ba4756af921b471ae3533d23fdaa988c851ad54.zip | |
compile all our mac builds against 1.1.0 in travis (#3689)
* compile all our mac builds against 1.1.0 in travis
* Just install
* try this why not
* ...
* of course
* upgrade the existing openssl
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 1 | ||||
| -rwxr-xr-x | .travis/run.sh | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 6b66f5bf..130d30f7 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -8,6 +8,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then brew update || brew update brew outdated openssl || brew upgrade openssl + brew install openssl@1.1 # install pyenv git clone --depth 1 https://github.com/pyenv/pyenv ~/.pyenv diff --git a/.travis/run.sh b/.travis/run.sh index a1b527bb..2b9479d8 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -12,11 +12,13 @@ if [[ "$(uname -s)" == "Darwin" ]]; then # set our flags to use homebrew openssl # if the build is static we need different LDFLAGS if [[ "${CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS}" == "1" ]]; then - export LDFLAGS="/usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a" + export LDFLAGS="/usr/local/opt/openssl\@1.1/lib/libssl.a /usr/local/opt/openssl\@1.1/lib/libcrypto.a" + export CFLAGS="-I/usr/local/opt/openssl\@1.1/include" else + # Compile the dynamic link build against 1.0.2 because the linker refuses to properly load 1.1.0 export LDFLAGS="-L/usr/local/opt/openssl/lib" + export CFLAGS="-I/usr/local/opt/openssl/include" fi - export CFLAGS="-I/usr/local/opt/openssl/include" else if [[ "${TOXENV}" == "pypy" ]]; then PYENV_ROOT="$HOME/.pyenv" |