From adeaacfa567b32401d3bef848b78d078bf4393ec Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 24 May 2017 12:49:18 -0700 Subject: 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. --- .travis/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis') 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" -- cgit v1.2.3