diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-07-22 00:40:13 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-08-20 17:15:55 +0200 |
commit | 5751ba0c1c774d69512cad2bd2c17e40b03af31a (patch) | |
tree | 3efe3615509589c8c6360aae490b55c54e4b8d55 /CIbuild.sh | |
parent | Merge pull request #2391 from SamJBarney/CropGrowthFix (diff) | |
download | cuberite-5751ba0c1c774d69512cad2bd2c17e40b03af31a.tar cuberite-5751ba0c1c774d69512cad2bd2c17e40b03af31a.tar.gz cuberite-5751ba0c1c774d69512cad2bd2c17e40b03af31a.tar.bz2 cuberite-5751ba0c1c774d69512cad2bd2c17e40b03af31a.tar.lz cuberite-5751ba0c1c774d69512cad2bd2c17e40b03af31a.tar.xz cuberite-5751ba0c1c774d69512cad2bd2c17e40b03af31a.tar.zst cuberite-5751ba0c1c774d69512cad2bd2c17e40b03af31a.zip |
Diffstat (limited to 'CIbuild.sh')
-rwxr-xr-x | CIbuild.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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..." |