summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-12-13 21:58:28 +0100
committerTycho <work.tycho+git@gmail.com>2014-12-13 21:58:28 +0100
commit3d9c88affa41d3b35698ef51161a908b0f53780b (patch)
tree1cff878fd50650f3ba376d2d131fead1510ea600
parentMerge pull request #1664 from mc-server/SandstoneCaves (diff)
downloadcuberite-3d9c88affa41d3b35698ef51161a908b0f53780b.tar
cuberite-3d9c88affa41d3b35698ef51161a908b0f53780b.tar.gz
cuberite-3d9c88affa41d3b35698ef51161a908b0f53780b.tar.bz2
cuberite-3d9c88affa41d3b35698ef51161a908b0f53780b.tar.lz
cuberite-3d9c88affa41d3b35698ef51161a908b0f53780b.tar.xz
cuberite-3d9c88affa41d3b35698ef51161a908b0f53780b.tar.zst
cuberite-3d9c88affa41d3b35698ef51161a908b0f53780b.zip
Diffstat (limited to '')
-rw-r--r--.travis.yml9
1 files 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