diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-10-16 14:19:52 +0100 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-10-16 14:19:52 +0100 |
| commit | 1f8a60452fb5f2e758b895157685a07dea5b3462 (patch) | |
| tree | 19e1f61fa9198036bdac90bd3f8d7da443b21052 /.travis | |
| parent | bf88065dc0c516614f8613e7f5606484b9667ebb (diff) | |
| parent | beb719a4d8823a3a6cdf9dd86d24680d6be8b75c (diff) | |
| download | cryptography-1f8a60452fb5f2e758b895157685a07dea5b3462.tar.gz cryptography-1f8a60452fb5f2e758b895157685a07dea5b3462.tar.bz2 cryptography-1f8a60452fb5f2e758b895157685a07dea5b3462.zip | |
Merge pull request #1412 from reaperhulk/update-osx-flags
Remove some (probably) unneeded flags in travis config
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/run.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index 6686a20f..e4ff2661 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -6,9 +6,8 @@ set -x if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)" if [[ "${OPENSSL}" != "0.9.8" ]]; then - # set our flags to use homebrew openssl and not error on - # unused compiler args (looking at you mno-fused-madd) - export ARCHFLAGS="-arch x86_64 -Wno-error=unused-command-line-argument-hard-error-in-future" + # set our flags to use homebrew openssl + export ARCHFLAGS="-arch x86_64" export LDFLAGS="-L/usr/local/opt/openssl/lib" export CFLAGS="-I/usr/local/opt/openssl/include" # The Travis OS X jobs are run for two versions @@ -16,8 +15,6 @@ if [[ "$(uname -s)" == "Darwin" ]]; then # CommonCrypto backend tests once. Exclude # CommonCrypto when we test against brew OpenSSL export TOX_FLAGS="--backend=openssl" - else - export ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future" fi fi source ~/.venv/bin/activate |