X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=3212432d5fac9dbab8bb651ffac1ae0942cacfaa;hb=ea254fcd3c1050d691b43f0e2c5570e32d0783dd;hp=719fcb06be41d5e74a23a5635343fef84173403b;hpb=e9de19ffcaace73931260cd8ef935f077c13ec23;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 719fcb06be4..3212432d5fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,8 +147,8 @@ meson-clang:
     UNWIND: "true"
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "auto"
-    CC: "ccache clang-7"
-    CXX: "ccache clang++-7"
+    CC: "ccache clang-8"
+    CXX: "ccache clang++-8"
   before_script:
     - export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache"
     - ccache --zero-stats --show-stats || true
@@ -315,7 +315,9 @@ scons-llvm:
   variables:
     SCONS_TARGET: "llvm=1"
     SCONS_CHECK_COMMAND: "scons llvm=1 check"
-    LLVM_VERSION: "3.9"
+    LLVM_VERSION: "3.4"
+    # LLVM 3.4 packages were built with an old libstdc++ ABI
+    CXX: "g++ -D_GLIBCXX_USE_CXX11_ABI=0"
 
 scons-swr:
   extends: .scons-build