From 61d1751dfff71d8fd433c6c84bd39db1672a3ee6 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 5 Oct 2016 22:17:22 +0200
Subject: Travis: build matrix improvements + CPP11 build

---
 util/travis/before_install.sh | 10 +---------
 util/travis/script.sh         |  4 ++++
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'util/travis')

diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index 70037389b..a2eb37803 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -1,16 +1,8 @@
 #!/bin/bash -e
 
 if [[ $TRAVIS_OS_NAME == "linux" ]]; then
-	if [[ $CC == "clang" ]]; then
-		export PATH="/usr/bin/:$PATH"
-		sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
-		sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
-		sudo apt-get update
-		sudo apt-get install llvm-3.1
-		sudo apt-get install clang
-	fi
 	sudo apt-get update
-	sudo apt-get install p7zip-full
+	sudo apt-get install p7zip-full $COMPILER
 fi
 
 if [[ $PLATFORM == "Unix" ]]; then
diff --git a/util/travis/script.sh b/util/travis/script.sh
index 870954ebb..4f37d8f5a 100755
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -4,6 +4,10 @@ if [[ $PLATFORM == "Unix" ]]; then
 	mkdir -p travisbuild
 	cd travisbuild || exit 1
 	CMAKE_FLAGS=''
+	if [[ $COMPILER == "g++-6" ]]; then
+		export CC=gcc-6
+		export CXX=g++-6
+	fi
 	# Clang builds with FreeType fail on Travis
 	if [[ $CC == "clang" ]]; then
 		CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE'
-- 
cgit v1.2.3