summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2015-05-24 19:13:09 -0500
committerwushin <pasekei@gmail.com>2015-05-25 14:19:41 -0500
commit097e924102d7f9de5fed7c7bc537e378b72a6340 (patch)
tree1e4253b8fdc8af44fae16aafea0784fd08c6afc4 /.travis.yml
parentb8519f9aa5ecd6cad984d53b27269ae9dec37b47 (diff)
downloadtmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.tar.gz
tmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.tar.bz2
tmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.tar.xz
tmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.zip
Fix fabi gcc travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index bebade1..accc0ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,8 +57,8 @@ script:
- mkdir build
- cd build
- git init
- - echo ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS
- - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS
+ - echo ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi` $EXTRA_CONFIGURE_ARGS
+ - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi` $EXTRA_CONFIGURE_ARGS
- make -R -k -j2
- make -R -k -j2 test TESTER='valgrind --error-exitcode=1 --track-fds=yes'
@@ -103,7 +103,7 @@ matrix:
- compiler: gcc
env: REAL_CC=gcc-4.9 REAL_CXX=g++-4.9 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.9 DEBUGPACKAGE=libstdc++6-4.9-dbg
- compiler: gcc
- env: REAL_CC=gcc-5 REAL_CXX=g++-5 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-5 DEBUGPACKAGE=libstdc++6-4.9-dbg
+ env: REAL_CC=gcc-5 REAL_CXX=g++-5 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-5 DEBUGPACKAGE=libstdc++6-5-dbg
- compiler: gcc
env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.7 DEBUGPACKAGE=libstdc++6-4.8-dbg EXTRA_CONFIGURE_ARGS=--disable-warnings