From 64b2bf56709b74bed33c7ccdfbbe84398194439e Mon Sep 17 00:00:00 2001
From: Romain BOULLARD <romain.boullard@protonmail.com>
Date: Thu, 16 Apr 2026 13:41:26 +0000
Subject: [PATCH] Update LLVM to 22 and Mold to 2.41.0 (#12)

Reviewed-on: https://git.romainboullard.com/BigfootDev/DockerImages/pulls/12
Co-authored-by: Romain BOULLARD <romain.boullard@protonmail.com>
Co-committed-by: Romain BOULLARD <romain.boullard@protonmail.com>
---
 .gitea/workflows/ci.yaml     |  4 ++--
 Linux/BaseBuilder/Dockerfile |  3 +--
 Linux/CPPBuilder/Dockerfile  | 24 ++++++++----------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index ed85444..483fdd9 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Build
         run: |
-          docker build -t ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} ./Linux/BaseBuilder
+          docker build -t ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --no-cache ./Linux/BaseBuilder
 
       - name: Login to registry
         run: |
@@ -54,7 +54,7 @@ jobs:
 
       - name: Build
         run: |
-          docker build -t ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --build-arg BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} ./Linux/CPPBuilder
+          docker build -t ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --build-arg BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --no-cache ./Linux/CPPBuilder
 
       - name: Login to registry
         run: |
diff --git a/Linux/BaseBuilder/Dockerfile b/Linux/BaseBuilder/Dockerfile
index d30443f..a216dc0 100644
--- a/Linux/BaseBuilder/Dockerfile
+++ b/Linux/BaseBuilder/Dockerfile
@@ -20,5 +20,4 @@ RUN apt-get update && apt-get install -y \
         lsb-release \
         software-properties-common \
         gnupg \
-        python3 \
-    && rm -rf /var/lib/apt/lists/*
+        python3
diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile
index 1246145..84dacff 100644
--- a/Linux/CPPBuilder/Dockerfile
+++ b/Linux/CPPBuilder/Dockerfile
@@ -16,26 +16,18 @@ RUN apt-get update && apt-get install -y \
         wget \
         lsb-release \
         software-properties-common \
-        pipx \
-    && rm -rf /var/lib/apt/lists/*
+        pipx
 
 ENV PATH="/root/.local/bin:${PATH}"
 
-# Install LLVM 20 and symlink tools
+# Install LLVM 22 and symlink tools
 RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
     && chmod +x /tmp/llvm.sh \
-    && /tmp/llvm.sh 20 all \
-    && ln -sf /usr/bin/clang-20 /usr/bin/clang \
-    && ln -sf /usr/bin/clang++-20 /usr/bin/clang++ \
-    && ln -sf /usr/bin/llvm-profdata-20 /usr/bin/llvm-profdata \
-    && ln -sf /usr/bin/llvm-cov-20 /usr/bin/llvm-cov \
-    && ln -sf /usr/bin/clang-format-20 /usr/bin/clang-format \
-    && ln -sf /usr/bin/clang-tidy-20 /usr/bin/clang-tidy \
-    && ln -sf /usr/bin/run-clang-tidy-20 /usr/bin/run-clang-tidy \
-    && ln -sf /usr/bin/llvm-ar-20 /usr/bin/llvm-ar \
-    && ln -sf /usr/bin/llvm-nm-20 /usr/bin/llvm-nm \
-    && ln -sf /usr/bin/llvm-ranlib-20 /usr/bin/llvm-ranlib \
-    && rm -f /tmp/llvm.sh
+    && /tmp/llvm.sh 22 all \
+    && for f in /usr/lib/llvm-22/bin/*; do \
+           ln -sf "$f" "/usr/local/bin/$(basename "$f")"; \
+       done \
+    && rm -f /tmp/llvm.sh*
 
 RUN VERSION=1.2.0; \
     curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux-x86_64-v$VERSION.tar.xz" \
@@ -47,7 +39,7 @@ RUN pipx install conan \
     && pipx install gcovr
 
 # Build and install mold
-RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \
+RUN git clone --branch v2.41.0 https://github.com/rui314/mold.git /tmp/mold \
     && cd /tmp/mold \
     && cmake . -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_CXX_COMPILER=clang++ \