summaryrefslogtreecommitdiff
path: root/util/travis/script.sh
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2016-10-05 22:17:22 +0200
committerNer'zhul <nerzhul@users.noreply.github.com>2016-10-06 00:28:24 +0200
commit61d1751dfff71d8fd433c6c84bd39db1672a3ee6 (patch)
treeead3afdfcc79b05f2cd18b16782fa8e68a8a8d81 /util/travis/script.sh
parent7fab86a49dd569f24804eb7396843e61095e3854 (diff)
downloadminetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.tar.gz
minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.tar.bz2
minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.zip
Travis: build matrix improvements + CPP11 build
Diffstat (limited to 'util/travis/script.sh')
-rwxr-xr-xutil/travis/script.sh4
1 files changed, 4 insertions, 0 deletions
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'