summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2015-01-03 13:39:01 -0800
committerBen Longbons <b.r.longbons@gmail.com>2015-01-03 13:39:01 -0800
commit0689b8424345cc305530deb7fa743335d282e103 (patch)
tree4c12287e05d9abf9e17370d2dfc386d8ea4ad539 /.travis.yml
parent6bf7732916c9b1c936465f5ad57572dd4fb6554f (diff)
downloadtmwa-0689b8424345cc305530deb7fa743335d282e103.tar.gz
tmwa-0689b8424345cc305530deb7fa743335d282e103.tar.bz2
tmwa-0689b8424345cc305530deb7fa743335d282e103.tar.xz
tmwa-0689b8424345cc305530deb7fa743335d282e103.zip
Fix clang builds
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index dcd0932..794aa44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ script:
- mkdir build
- cd build
- git init
- - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6 --disable-shared` $EXTRA_CONFIGURE_ARGS
+ - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS
- make -R -k -j2
- make -R -k -j2 test TESTER='valgrind --error-exitcode=1 --track-fds=yes'
@@ -78,8 +78,6 @@ matrix:
allow_failures:
- compiler: clang
env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.3 DEBUGPACKAGE=libstdc++6-4.6-dbg
- - compiler: clang
- env: REAL_CC=clang-3.5 REAL_CXX=clang++-3.5 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.5 DEBUGPACKAGE=libstdc++6-4.6-dbg
exclude:
- env: ignore=this
include: