diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2016-03-15 21:55:11 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2016-03-15 21:55:11 +0800 |
| commit | e708f9542f47f8764b0e088fbc94917102bdb717 (patch) | |
| tree | e677435a559f9708ab6e90b6d018eb046493e2d9 | |
| parent | 6bfbcdbfdb00f22727cfb749b1c60a80210ecfc7 (diff) | |
| parent | 9b0a2714f026a4a6b6bd6d2b0b6b84f5b9ad75af (diff) | |
Merge pull request #23 from Chocobo1/travis_fix
TravisCI: re-enable MULTI=1 & NOWRITEV=1 builds on OSX
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index b84b84a..cb0149c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,6 @@ matrix: exclude: - os: osx env: BUNDLEDLIBTOM=--disable-bundled-libtom WEXTRAFLAGS=-Werror - - os: osx - env: MULTI=1 - - os: osx - env: NOWRITEV=1 compiler: - gcc @@ -40,11 +36,11 @@ before_install: - if [ "$CC" = "clang" ]; then WEXTRAFLAGS="$WEXTRAFLAGS -Wno-error=incompatible-library-redeclaration" ; fi # workaround install: - - if [ "$TRAVIS_OS_NAME" = "osx" -a "$BUNDLEDLIBTOM" != "--enable-bundled-libtom" ]; then brew update > /dev/null && brew install libtomcrypt libtommath ; fi + - if [ "$TRAVIS_OS_NAME" = "osx" -a "$BUNDLEDLIBTOM" = "--disable-bundled-libtom" ]; then brew update > /dev/null && brew install libtomcrypt libtommath ; fi script: - autoconf && autoheader && ./configure "$BUNDLEDLIBTOM" CFLAGS="-O2 -Wall -Wno-pointer-sign $WEXTRAFLAGS" --prefix="$HOME/inst" - - if [ "$NOWRITEV" = "1" ]; then sed -i s/HAVE_WRITEV/DONT_HAVE_WRITEV/ config.h ; fi + - if [ "$NOWRITEV" = "1" ]; then sed -i -e s/HAVE_WRITEV/DONT_HAVE_WRITEV/ config.h ; fi - make -j3 install after_success: |