From: Avi Kivity <
a...@scylladb.com>
Committer: Nadav Har'El <
n...@scylladb.com>
Branch: next
build: update frozen toolchain to Fedora 40 with clang 18.1.6
This refreshes our dependencies to a supported distribution.
Closes scylladb/scylladb#19205
---
diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile
--- a/tools/toolchain/Dockerfile
+++ b/tools/toolchain/Dockerfile
@@ -1,4 +1,4 @@
-FROM
docker.io/fedora:38
+FROM
docker.io/fedora:40
ARG CLANG_BUILD="SKIP"
ARG CLANG_ARCHIVE
diff --git a/tools/toolchain/image b/tools/toolchain/image
--- a/tools/toolchain/image
+++ b/tools/toolchain/image
@@ -1 +1 @@
-
docker.io/scylladb/scylla-toolchain:fedora-38-20240617
+
docker.io/scylladb/scylla-toolchain:fedora-40-20240621
diff --git a/tools/toolchain/optimized_clang.sh b/tools/toolchain/optimized_clang.sh
--- a/tools/toolchain/optimized_clang.sh
+++ b/tools/toolchain/optimized_clang.sh
@@ -42,8 +42,8 @@ SCYLLA_BUILD_DIR_FULLPATH="${SCYLLA_DIR}"/"${SCYLLA_BUILD_DIR}"
SCYLLA_NINJA_FILE_FULLPATH="${SCYLLA_DIR}"/"${SCYLLA_NINJA_FILE}"
# Which LLVM release to build in order to compile Scylla
-LLVM_CLANG_TAG=16.0.6
-CLANG_SUFFIX=16
+LLVM_CLANG_TAG=18.1.6
+CLANG_SUFFIX=18
CLANG_ARCHIVE=$(cd "${SCYLLA_DIR}" && realpath -m "${CLANG_ARCHIVE}")