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

CI/FreeBSD: switch TravisCI to Clang 11

Browse Source
This commit is contained in:
Jan Beich 2020-11-06 14:57:33 +00:00 committed by Ani
parent acb17b0298
commit e2303f3378
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.ci/build-freebsd.sh
View File

@ -5,15 +5,13 @@
# shellcheck disable=SC2046 # shellcheck disable=SC2046
git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
# XXX Drop after Travis upgrades FreeBSD to 12.2 (see also .ci/install-freebsd.sh) # Prefer newer Clang on TravisCI (see also .ci/install-freebsd.sh)
case $(${CXX:-c++} --version) in if [ -n "$TRAVIS" ]; then
*version\ 8.0.*) fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/libcxx-11.0.0.src.tar.xz
fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxx-10.0.0.src.tar.xz tar xf libcxx-11.0.0.src.tar.xz
tar xf libcxx-10.0.0.src.tar.xz export CC=clang11 CXX=clang++11
export CC=clang10 CXX=clang++10 export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem $PWD/libcxx-11.0.0.src/include"
export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem $PWD/libcxx-10.0.0.src/include" fi
;;
esac
CONFIGURE_ARGS=" CONFIGURE_ARGS="
-DWITH_LLVM=OFF -DWITH_LLVM=OFF

10
.ci/install-freebsd.sh
View File

@ -8,12 +8,10 @@ sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
export ASSUME_ALWAYS_YES=true export ASSUME_ALWAYS_YES=true
pkg info # debug pkg info # debug
# XXX Drop after Travis upgrades FreeBSD to 12.2 (see also .ci/build-freebsd.sh) # Prefer newer Clang on TravisCI (see also .ci/install-freebsd.sh)
case $(${CXX:-c++} --version) in if [ -n "$TRAVIS" ]; then
*version\ 8.0.*) pkg install llvm11
pkg install llvm10 fi
;;
esac
# Mandatory dependencies (qt5-dbus and qt5-gui are pulled via qt5-widgets) # Mandatory dependencies (qt5-dbus and qt5-gui are pulled via qt5-widgets)
pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent glew openal-soft ffmpeg pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent glew openal-soft ffmpeg