From 3f7b9b45eaa15fc9b14b0afe07726fcc8b61e6d7 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 5 Jan 2015 23:23:20 +0100
Subject: [PATCH] Travis CI: More fixes to really move to GCC 4.8

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 957ab7f148..fd2a6b6d1c 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