mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use clang 5.0 in travis (#4115)

Browse Source 
* Use clang 5.0 in travis

* Change clang-5.0 to just clang
This commit is contained in:
Zion 2018-01-26 10:18:09 -08:00 committed by Ani
parent b9c10a186d
commit 9614fef4b9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -26,9 +26,6 @@ git:
submodules: false submodules: false
before_install: before_install:
- if [ "$CC" = "clang" ]; then
export CXX="clang++-4.0" CC="clang-4.0";
fi;
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then
export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security"; export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security";
fi; fi;
@ -65,7 +62,7 @@ before_script:
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -G Ninja; - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -G Ninja;
- ninja - ninja
- # AppImage generation - # AppImage generation
- if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang-4.0" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then - if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
export LD_LIBRARY_PATH=~/Qt/5.10.0/gcc_64/lib; export LD_LIBRARY_PATH=~/Qt/5.10.0/gcc_64/lib;
DESTDIR=appdir ninja install ; find appdir/ ; DESTDIR=appdir ninja install ; find appdir/ ;
find ../bin ; find ../bin ;
@ -111,7 +108,8 @@ addons:
- libc6-dev - libc6-dev
- llvm-4.0 - llvm-4.0
- llvm-4.0-dev - llvm-4.0-dev
- clang-4.0 # Clang 5.0 is now bundled in travis, so we no longer need the ppa version.
#- clang-4.0
- libedit-dev - libedit-dev
- g++-5 - g++-5
- gcc-5 - gcc-5