Browse Source

Try Travis again

Thomas Buck 8 years ago
parent
commit
ad05e1918e
2 changed files with 11 additions and 3 deletions
  1. 1
    2
      cmake/travis_before_install_linux.sh
  2. 10
    1
      cmake/travis_install_linux.sh

+ 1
- 2
cmake/travis_before_install_linux.sh View File

@@ -3,7 +3,6 @@
3 3
 sudo add-apt-repository -y ppa:zoogie/sdl2-snapshots
4 4
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
5 5
 sudo add-apt-repository -y ppa:andykimpe/cmake
6
-sudo add-apt-repository -y ppa:jhe/libc++
7
-sudo add-apt-repository -y 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main'
6
+sudo add-apt-repository -y ppa:h-rayflood/llvm
8 7
 sudo apt-get -qq -y update
9 8
 

+ 10
- 1
cmake/travis_install_linux.sh View File

@@ -5,9 +5,18 @@ sudo apt-get -qq -y install libsdl2-dev libsdl2-ttf-dev libalut-dev libpng12-dev
5 5
 if [ "$CC" = "gcc" ]; then sudo apt-get install gcc-4.8; fi
6 6
 if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
7 7
 
8
-if [ "$CXX" = "clang++" ]; then sudo apt-get install --allow-unauthenticated clang-3.5 libc++-dev; fi
8
+if [ "$CXX" = "clang++" ]; then sudo apt-get install --allow-unauthenticated clang-3.5; fi
9 9
 
10 10
 wget 'http://downloads.sourceforge.net/project/ogl-math/glm-0.9.6.3/glm-0.9.6.3.zip'
11 11
 unzip glm-0.9.6.3.zip
12 12
 sudo cp -R glm/glm /usr/local/include/glm
13 13
 
14
+if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++"; fi
15
+if [ "$CXX" = "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi
16
+if [ "$CXX" = "clang++" ]; then cd libcxx/lib && bash buildit; fi
17
+if [ "$CXX" = "clang++" ]; then sudo cp ./libc++.so.1.0 /usr/lib/; fi
18
+if [ "$CXX" = "clang++" ]; then sudo mkdir /usr/include/c++/v1; fi
19
+if [ "$CXX" = "clang++" ]; then cd .. && sudo cp -r include/* /usr/include/c++/v1/; fi
20
+if [ "$CXX" = "clang++" ]; then cd /usr/lib && sudo ln -sf libc++.so.1.0 libc++.so; fi
21
+if [ "$CXX" = "clang++" ]; then sudo ln -sf libc++.so.1.0 libc++.so.1 && cd $cwd; fi
22
+

Loading…
Cancel
Save