summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-12-13 23:09:37 +0100
committerTycho <work.tycho+git@gmail.com>2014-12-13 23:12:53 +0100
commit7542255d5c90b907016b8e2cb84ccb82af809181 (patch)
tree639f751cdce606c65c4c5b8899f9417e67a28150
parentfinal syntax errors (diff)
downloadcuberite-7542255d5c90b907016b8e2cb84ccb82af809181.tar
cuberite-7542255d5c90b907016b8e2cb84ccb82af809181.tar.gz
cuberite-7542255d5c90b907016b8e2cb84ccb82af809181.tar.bz2
cuberite-7542255d5c90b907016b8e2cb84ccb82af809181.tar.lz
cuberite-7542255d5c90b907016b8e2cb84ccb82af809181.tar.xz
cuberite-7542255d5c90b907016b8e2cb84ccb82af809181.tar.zst
cuberite-7542255d5c90b907016b8e2cb84ccb82af809181.zip
Diffstat (limited to '')
-rw-r--r--.travis.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index eaf8f116a..26e74c1b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,14 @@ before_install:
- if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]; then sudo pip install cpp_coveralls; fi
# g++4.8
- - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
- - if [ "$CXX" == "g++" ]; then sudo apt-get update -qq; fi
+ - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+ - sudo apt-get update -qq
install:
+ # g++4.8 and clang
+ - sudo apt-get install -qq g++-4.8
+
# g++4.8
- - if [ "$CXX" == "g++" ]; then sudo apt-get install -qq g++-4.8; fi
- if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; export CC="gcc-4.8"; fi
# Build MCServer