diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-05 23:23:20 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-05 23:23:20 +0100 |
| commit | 3f7b9b45eaa15fc9b14b0afe07726fcc8b61e6d7 (patch) | |
| tree | d641322cbd9fdba9feeab63dabab06de7b0b05a1 | |
| parent | 3fb61cf41e054fc27946281b8962d3ca9e3b0cba (diff) | |
| download | px4-firmware-3f7b9b45eaa15fc9b14b0afe07726fcc8b61e6d7.tar.gz px4-firmware-3f7b9b45eaa15fc9b14b0afe07726fcc8b61e6d7.tar.bz2 px4-firmware-3f7b9b45eaa15fc9b14b0afe07726fcc8b61e6d7.zip | |
Travis CI: More fixes to really move to GCC 4.8
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 957ab7f14..fd2a6b6d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,12 @@ # http://travis-ci.org language: cpp -compiler: gcc before_script: - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq - - sudo apt-get install -qq gcc-4.8 g++-4.8 libstdc++-4.8-dev + - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8 gcc-4.8 libstdc++-4.8-dev; fi + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi # Travis specific tools - sudo apt-get install s3cmd grep zip mailutils # General toolchain dependencies |