Revert "Use clang-3.5 for travis tests on linux"
This reverts commit 41248c5728
.
This commit is contained in:
parent
993e842fdf
commit
a41ac650ba
|
@ -9,9 +9,6 @@ before_install:
|
||||||
- if [ $TRAVIS_OS_NAME = linux ]; then
|
- if [ $TRAVIS_OS_NAME = linux ]; then
|
||||||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y;
|
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y;
|
||||||
sudo add-apt-repository ppa:boost-latest/ppa -y;
|
sudo add-apt-repository ppa:boost-latest/ppa -y;
|
||||||
if [ "$CXX" = "clang++" ]; then
|
|
||||||
sudo add-apt-repository ppa:h-rayflood/llvm-upper -y;
|
|
||||||
fi;
|
|
||||||
sudo apt-get update -qq;
|
sudo apt-get update -qq;
|
||||||
elif [ $TRAVIS_OS_NAME = osx ]; then
|
elif [ $TRAVIS_OS_NAME = osx ]; then
|
||||||
brew update;
|
brew update;
|
||||||
|
@ -20,8 +17,6 @@ install:
|
||||||
- if [ $TRAVIS_OS_NAME = linux ]; then
|
- if [ $TRAVIS_OS_NAME = linux ]; then
|
||||||
if [ "$CXX" = "clang++" ]; then
|
if [ "$CXX" = "clang++" ]; then
|
||||||
sudo apt-get install -y libstdc++-4.9-dev;
|
sudo apt-get install -y libstdc++-4.9-dev;
|
||||||
sudo apt-get install -y clang-3.5;
|
|
||||||
export CXX=clang++-3.5;
|
|
||||||
elif [ "$CXX" = "g++" ]; then
|
elif [ "$CXX" = "g++" ]; then
|
||||||
sudo apt-get install -y g++-4.9;
|
sudo apt-get install -y g++-4.9;
|
||||||
export CXX=g++-4.9;
|
export CXX=g++-4.9;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user