llvm: try using version 17 for c++ compilation

faasm · Feb 20, 2024 · 7c8a74b · 7c8a74b
1 parent ee82d26
commit 7c8a74b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/conan/profile.txt b/conan/profile.txt
@@ -4,12 +4,12 @@ os_build=Linux
 arch=x86_64
 arch_build=x86_64
 compiler=clang
-compiler.version=18
-compiler.libcxx=libc++
+compiler.version=17
+compiler.libcxx=libstdc++11
 compiler.cppstd=20
 build_type=Release
 [options]
 [build_requires]
 [env]
-CC=/usr/bin/clang-18
-CXX=/usr/bin/clang++-18
+CC=/usr/bin/clang-17
+CXX=/usr/bin/clang++-17
diff --git a/docker/faabric-base.dockerfile b/docker/faabric-base.dockerfile
@@ -23,7 +23,7 @@ RUN apt update && apt install -y \
     clang-tidy-${LLVM_VERSION_MAJOR} \
     clang-tools-${LLVM_VERSION_MAJOR} \
     doxygen \
-    g++-12 \
+    g++-11 \
     git \
     libboost-filesystem-dev \
     libc++-${LLVM_VERSION_MAJOR}-dev \
@@ -33,7 +33,7 @@ RUN apt update && apt install -y \
     libpolly-${LLVM_VERSION_MAJOR}-dev \
     libpython3-dev \
     libssl-dev \
-    libstdc++-12-dev \
+    libstdc++-11-dev \
     libtool \
     libunwind-${LLVM_VERSION_MAJOR}-dev \
     libz-dev \

diff --git a/tasks/util/env.py b/tasks/util/env.py
@@ -20,8 +20,8 @@
 # to x86. For the LLVM version to cross-compile code to WebAssembly see
 # faasm/cpp/faasmtools/env.py. Ideally, both versions will be in sync but it
 # is not strictly necessary.
-# LLVM_VERSION = "17.0.6"
-LLVM_VERSION = "18.1.0-rc2"
+LLVM_VERSION = "17.0.6"
+# LLVM_VERSION = "18.1.0-rc2"
 LLVM_VERSION_MAJOR = LLVM_VERSION.split(".")[0]