diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-05 22:17:22 +0200 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-06 00:28:24 +0200 |
| commit | 61d1751dfff71d8fd433c6c84bd39db1672a3ee6 (patch) | |
| tree | ead3afdfcc79b05f2cd18b16782fa8e68a8a8d81 /util/travis/before_install.sh | |
| parent | 7fab86a49dd569f24804eb7396843e61095e3854 (diff) | |
| download | minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.tar.gz minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.tar.bz2 minetest-61d1751dfff71d8fd433c6c84bd39db1672a3ee6.zip | |
Travis: build matrix improvements + CPP11 build
Diffstat (limited to 'util/travis/before_install.sh')
| -rwxr-xr-x | util/travis/before_install.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index 70037389b..a2eb37803 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -1,16 +1,8 @@ #!/bin/bash -e if [[ $TRAVIS_OS_NAME == "linux" ]]; then - if [[ $CC == "clang" ]]; then - export PATH="/usr/bin/:$PATH" - sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list' - sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183 - sudo apt-get update - sudo apt-get install llvm-3.1 - sudo apt-get install clang - fi sudo apt-get update - sudo apt-get install p7zip-full + sudo apt-get install p7zip-full $COMPILER fi if [[ $PLATFORM == "Unix" ]]; then |