From 138c48b7e8b370fb0e86c3a2239eaf1cc54acb2b Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sat, 11 Jul 2015 14:27:19 -0500 Subject: [PATCH] gcc-4.6, clang-3.3 --- .travis.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 591b354..bc2f45e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,24 @@ # to allow C++11, though we are not yet building with -std=c++11 install: -- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi +# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available. +#- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi +- if [ "$CXX" = "g++" ]; then export CXX="g++-4.6" CC="gcc-4.6"; fi +# /usr/bin/clang is our version already, and clang-X.Y does not exist. +#- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.3" CC="clang-3.3"; fi +- echo ${PATH} +- ls /usr/local +- export PATH=/usr/bin:${PATH} +- echo ${CXX} +- ${CXX} --version addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-4.8 - - g++-4.8 - - clang + - gcc-4.6 + - g++-4.6 + - clang-3.3 - valgrind os: - linux