diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-05-24 12:49:18 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-05-24 12:49:18 -0700 |
| commit | adeaacfa567b32401d3bef848b78d078bf4393ec (patch) | |
| tree | 7486ba41d5e0f40e4b2e5b317b668b8db3b6041b /.travis | |
| parent | cd5b47fceba4b78d16e584a6703f4ab837c040fd (diff) | |
| download | cryptography-adeaacfa567b32401d3bef848b78d078bf4393ec.tar.gz cryptography-adeaacfa567b32401d3bef848b78d078bf4393ec.tar.bz2 cryptography-adeaacfa567b32401d3bef848b78d078bf4393ec.zip | |
allow global suppression of link flags (#3592)
CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS will now suppress link flags regardless
of platform. Additionally, CRYPTOGRAPHY_WINDOWS_LINK_LEGACY_OPENSSL is
now the flag you need if you want to link against < 1.1.0 on windows.
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index 8d1a2c18..a1b527bb 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -11,7 +11,7 @@ if [[ "$(uname -s)" == "Darwin" ]]; then # set our flags to use homebrew openssl # if the build is static we need different LDFLAGS - if [[ "${CRYPTOGRAPHY_OSX_NO_LINK_FLAGS}" == "1" ]]; then + if [[ "${CRYPTOGRAPHY_SUPPRESS_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" |