From 22abf171132ef0329c0b9f8cb36f213277bf4124 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 31 Aug 2016 10:44:37 -0700 Subject: [PATCH 1/2] test building with g++-5d --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb64fe29..2580895f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,18 @@ env: matrix: include: + - os: linux + sudo: false + compiler: ": gcc5" + env: JOBS=10 CXX="ccache g++-5 -Qunused-arguments" CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" + addons: + apt: + sources: ['ubuntu-toolchain-r-test'] + packages: [ 'libstdc++-5-dev','g++-5'] - os: linux sudo: false compiler: ": clang" env: JOBS=10 CXX="ccache clang++-3.8 -Qunused-arguments" - sudo: false addons: apt: sources: ['ubuntu-toolchain-r-test'] @@ -27,7 +34,6 @@ matrix: sudo: false compiler: ": clang-coverage" env: JOBS=10 CXX="ccache clang++-3.8 -Qunused-arguments" COVERAGE=true BUILDTYPE=Debug - sudo: false addons: apt: sources: ['ubuntu-toolchain-r-test'] From e639605b82bdd88ab39e5a66a1bdf2f758b44540 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 31 Aug 2016 11:36:22 -0700 Subject: [PATCH 2/2] remove -Qunused-arguments flag for g++-5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2580895f..f3cb9fd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: - os: linux sudo: false compiler: ": gcc5" - env: JOBS=10 CXX="ccache g++-5 -Qunused-arguments" CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" + env: JOBS=10 CXX="ccache g++-5" CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" addons: apt: sources: ['ubuntu-toolchain-r-test']