From 3d9c88affa41d3b35698ef51161a908b0f53780b Mon Sep 17 00:00:00 2001 From: Tycho Date: Sat, 13 Dec 2014 20:58:28 +0000 Subject: "Don't set compiler to gcc on clang builds" --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e8377748..031e358d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,14 @@ before_install: - if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]; then sudo pip install cpp_coveralls; fi # g++4.8 - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq + - if [ "$CXX" = "g++"]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi + - if [ "$CXX" = "g++"]; sudo apt-get update -qq; fi install: # g++4.8 - - sudo apt-get install -qq g++-4.8 - - export CXX="g++-4.8" + - if [ "$CXX" = "g++"]; sudo apt-get install -qq g++-4.8; fi + - if [ "$CXX" = "g++"]; export CXX="g++-4.8"; fi + - if [ "$CXX" = "g++"]; export CC="gcc-4.8"; fi # Build MCServer script: ./CIbuild.sh -- cgit v1.2.3