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 /Jenkinsfile | |
| 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 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index adaf9f03..6cdf1623 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -223,7 +223,6 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) { bat """ cd cryptography @set PATH="C:\\Python27";"C:\\Python27\\Scripts";%PATH% - @set CRYPTOGRAPHY_WINDOWS_LINK_OPENSSL110=1 @set PYTHON="${pythonPath[toxenv]}" @set INCLUDE="${opensslPaths[label]['include']}";%INCLUDE% @@ -243,7 +242,7 @@ def build(toxenv, label, imageName, artifacts, artifactExcludes) { export PATH="/usr/local/bin:\${PATH}" export PATH="/Users/jenkins/.pyenv/shims:\${PATH}" cd cryptography - CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 \ + CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 \ LDFLAGS="/usr/local/opt/openssl\\@1.1/lib/libcrypto.a /usr/local/opt/openssl\\@1.1/lib/libssl.a" \ CFLAGS="-I/usr/local/opt/openssl\\@1.1/include -Werror -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-error=unused-function -Wno-error=unused-command-line-argument" \ tox -r -- --color=yes |