diff options
| author | David Reid <dreid@dreid.org> | 2014-04-16 16:53:32 -0400 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-04-16 16:53:32 -0400 |
| commit | cdb87dc34605a44ee398e8fb08598b8dbdd14bf2 (patch) | |
| tree | c29ef39d0a1cfb78c5916f655c3198aa26e07f5e | |
| parent | a7fa1b701b0788f18f0d4c3d5ad1f56a1086c772 (diff) | |
| parent | 42a8e8a0ec9302cd4baded343985bc083c692529 (diff) | |
| download | cryptography-cdb87dc34605a44ee398e8fb08598b8dbdd14bf2.tar.gz cryptography-cdb87dc34605a44ee398e8fb08598b8dbdd14bf2.tar.bz2 cryptography-cdb87dc34605a44ee398e8fb08598b8dbdd14bf2.zip | |
Merge pull request #934 from reaperhulk/travis-fused-madd-fun
Fix Travis OS X Builds
| -rwxr-xr-x | .travis/run.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index 6739c886..6686a20f 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -6,8 +6,9 @@ set -x if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)" if [[ "${OPENSSL}" != "0.9.8" ]]; then - # so set our flags to use homebrew openssl - export ARCHFLAGS="-arch x86_64" + # 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" 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 @@ -15,6 +16,8 @@ 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 |