diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-08-20 18:18:08 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-08-20 18:18:08 +0200 |
| commit | a341419b047bd76cc3572f5d3906500a7112e202 (patch) | |
| tree | 1dd7ee5497546420714dc673f48078a4565198d0 /CIbuild.sh | |
| parent | Merge pull request #2379 from cuberite/hunger (diff) | |
| parent | Use container-based infrastructure for Travis (diff) | |
| download | cuberite-a341419b047bd76cc3572f5d3906500a7112e202.tar cuberite-a341419b047bd76cc3572f5d3906500a7112e202.tar.gz cuberite-a341419b047bd76cc3572f5d3906500a7112e202.tar.bz2 cuberite-a341419b047bd76cc3572f5d3906500a7112e202.tar.lz cuberite-a341419b047bd76cc3572f5d3906500a7112e202.tar.xz cuberite-a341419b047bd76cc3572f5d3906500a7112e202.tar.zst cuberite-a341419b047bd76cc3572f5d3906500a7112e202.zip | |
Diffstat (limited to '')
| -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..." |