diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-04 20:19:02 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-04 20:23:10 -0800 |
| commit | 94ec7fbe018d194a96ce915692947296ff2a258b (patch) | |
| tree | 5ff02477a788b3f926ef627e01379a12b4b65f53 | |
| parent | 00da6b5977574a0564169172227d8aab45be188f (diff) | |
| download | tmwa-94ec7fbe018d194a96ce915692947296ff2a258b.tar.gz tmwa-94ec7fbe018d194a96ce915692947296ff2a258b.tar.bz2 tmwa-94ec7fbe018d194a96ce915692947296ff2a258b.tar.xz tmwa-94ec7fbe018d194a96ce915692947296ff2a258b.zip | |
Fix clang builds
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | src/warnings.hpp | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 794aa44..98af30e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,17 @@ install: - if [ -n "$PPA" ]; then + echo sudo add-apt-repository --yes $PPA; sudo add-apt-repository --yes $PPA; fi + - + if [ -n "$PPA2" ]; + then + echo sudo add-apt-repository --yes $PPA2; + sudo add-apt-repository --yes $PPA2; + fi - sudo apt-get update -qq + - echo sudo apt-get install -qq $PACKAGE $DEBUGPACKAGE - sudo apt-get install -qq $PACKAGE $DEBUGPACKAGE - sudo apt-get install -qq libgtest-dev valgrind - make --version @@ -49,6 +57,7 @@ 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 - make -R -k -j2 - make -R -k -j2 test TESTER='valgrind --error-exitcode=1 --track-fds=yes' @@ -86,7 +95,7 @@ matrix: - compiler: clang env: REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.4 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 + env: REAL_CC=clang-3.5 REAL_CXX=clang++-3.5 PPA=ppa:h-rayflood/llvm-upper PPA2=ppa:h-rayflood/gcc-upper PACKAGE=clang-3.5 DEBUGPACKAGE=libstdc++6-4.6-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 - compiler: gcc diff --git a/src/warnings.hpp b/src/warnings.hpp index 9389766..884857f 100644 --- a/src/warnings.hpp +++ b/src/warnings.hpp @@ -161,7 +161,10 @@ DIAG_E(trigraphs); DIAG_E(type_limits); DIAG_E(undef); DIAG_E(uninitialized); +// clang bug, fixed in 3.5 +#ifndef GENERATING_DEPENDENCIES DIAG_E(unknown_pragmas); +#endif DIAG_W(unreachable_code); DIAG_X(unsafe_loop_optimizations); DIAG_E(unused_but_set_parameter); |