ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Fix Travis CI clang build 

There are dependency issues with g++-4.8-multilib, so let's use
g++-4.9-multilib from the toolchain repo instead.

[skip appveyor]
This commit is contained in:
Jonathan Li 2016-02-11 20:38:07 +00:00
parent 50caca4002
commit b1404cff37
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
travis.sh
View File

@ -6,16 +6,18 @@ linux_32_before_install() {
# Build worker is 64-bit only by default it seems.
sudo dpkg --add-architecture i386
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
# Compilers
if [ "${CXX}" = "clang++" ]; then
sudo apt-key adv --fetch-keys http://llvm.org/apt/llvm-snapshot.gpg.key
sudo add-apt-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-${VERSION} main"
# g++-4.8-multilib is necessary for compiler dependencies. Well, I think
# the specific dependency is probably lib32gcc-4.8-dev.
COMPILER_PACKAGE="clang-${VERSION} g++-4.8-multilib"
# g++-4.9-multilib is necessary for compiler dependencies. 4.8 currently
# has dependency issues, but 4.9 from the toolchain repo seems to work
# fine, so let's just use that.
COMPILER_PACKAGE="clang-${VERSION} g++-4.9-multilib"
fi
if [ "${CXX}" = "g++" ]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
COMPILER_PACKAGE="g++-${VERSION}-multilib"
fi