From 5751ba0c1c774d69512cad2bd2c17e40b03af31a Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Tue, 21 Jul 2015 23:40:13 +0100
Subject: Use container-based infrastructure for Travis

---
 CIbuild.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'CIbuild.sh')

diff --git a/CIbuild.sh b/CIbuild.sh
index 60fed73c2..100a64b0c 100755
--- a/CIbuild.sh
+++ b/CIbuild.sh
@@ -6,6 +6,11 @@ export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
 export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
 export MCSERVER_BUILD_DATETIME=`date`
 
+if [ "$CXX" == "g++" ]; then
+	# This is a temporary workaround to allow the identification of GCC-4.8 by CMake, required for C++11 features
+	# Travis Docker containers don't allow sudo, which update-alternatives needs, and it seems no alternative to this command is provided, hence:
+	export CXX="/usr/bin/g++-4.8"
+fi
 cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1;
 
 echo "Checking basic style..."
-- 
cgit v1.2.3