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.yml | |
| 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.yml')
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 87e4304e..147ed881 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,45 +44,45 @@ matrix: # 8.3 is macOS 10.12.x # see: https://docs.travis-ci.com/user/osx-ci-environment/ osx_image: xcode8.3 - env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=py33 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=py33 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=py34 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=py34 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=py35 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=py35 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=py36 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=py36 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=pypy CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 PYPY_VERSION=5.7.1 + env: TOXENV=pypy CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 PYPY_VERSION=5.7.1 - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=0 + env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=0 - language: generic os: osx # 7.3 is OS X 10.11.x osx_image: xcode7.3 - env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 - language: generic os: osx # 6.4 is OS X 10.10.x osx_image: xcode6.4 - env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=docs CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + env: TOXENV=docs CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 install: - ./.travis/install.sh |