CI/FreeBSD: switch TravisCI to Clang 11

RPCS3 · Nov 6, 2020 · 591eb0a · 591eb0a
1 parent dd45438
commit 591eb0a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh
@@ -5,15 +5,13 @@
 # shellcheck disable=SC2046
 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)
-case $(${CXX:-c++} --version) in
-    *version\ 8.0.*)
-	fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxx-10.0.0.src.tar.xz
-	tar xf libcxx-10.0.0.src.tar.xz
-	export CC=clang10 CXX=clang++10
-	export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem $PWD/libcxx-10.0.0.src/include"
-	;;
-esac
+# Prefer newer Clang on TravisCI (see also .ci/install-freebsd.sh)
+if [ -n "$TRAVIS" ]; then
+	fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/libcxx-11.0.0.src.tar.xz
+	tar xf libcxx-11.0.0.src.tar.xz
+	export CC=clang11 CXX=clang++11
+	export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem $PWD/libcxx-11.0.0.src/include"
+fi
 
 CONFIGURE_ARGS="
 	-DWITH_LLVM=OFF

diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh
@@ -8,12 +8,10 @@ sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
 export ASSUME_ALWAYS_YES=true
 pkg info # debug
 
-# XXX Drop after Travis upgrades FreeBSD to 12.2 (see also .ci/build-freebsd.sh)
-case $(${CXX:-c++} --version) in
-    *version\ 8.0.*)
-	pkg install llvm10
-	;;
-esac
+# Prefer newer Clang on TravisCI (see also .ci/install-freebsd.sh)
+if [ -n "$TRAVIS" ]; then
+	pkg install llvm11
+fi
 
 # 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