mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-12-26 12:17:32 +00:00
Purge llvm compiling from travis (yay!)
Reduces build times greatly.
This commit is contained in:
parent
26f6b89530
commit
af90f03323
@ -35,7 +35,7 @@ before_install:
|
||||
# And the libstdc++4.9 of GCC from ppa
|
||||
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
|
||||
- sudo apt-get update
|
||||
- sudo apt-get install libwxgtk3.0-dev libopenal-dev freeglut3-dev libglew-dev libc6-dev
|
||||
- sudo apt-get install libwxgtk3.0-dev libopenal-dev freeglut3-dev libglew-dev libc6-dev llvm-3.6 llvm-3.6-dev libedit-dev
|
||||
- sudo apt-get install aria2 -qq
|
||||
- download_extract() { aria2c -x 16 $1 -o $2 && tar -xf $2; }
|
||||
- if [ "$CXX" = "g++" ]; then
|
||||
@ -43,7 +43,7 @@ before_install:
|
||||
export CXX="g++-4.9" CC="gcc-4.9";
|
||||
export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01';
|
||||
else
|
||||
sudo apt-get install -qq --allow-unauthenticated llvm-3.6 llvm-3.6-dev clang-3.6 libstdc++-4.8-dev;
|
||||
sudo apt-get install -qq --allow-unauthenticated clang-3.6 libstdc++-4.8-dev;
|
||||
export CXX="clang++-3.6" CC="clang-3.6";
|
||||
fi;
|
||||
# Travis uses CMake 2.8.7. We require 2.8.8. Grab latest
|
||||
@ -56,11 +56,6 @@ before_install:
|
||||
|
||||
before_script:
|
||||
- git submodule update --init asmjit ffmpeg llvm
|
||||
- cd llvm_build
|
||||
- cmake -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF ../llvm
|
||||
- make -j 4
|
||||
- sudo make install
|
||||
- cd ..
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake ..
|
||||
|
Loading…
Reference in New Issue
Block a user