Merge pull request #400 from AntelopeIO/clang18

update pinned build to clang 18.1.8
AntelopeIO · Jul 25, 2024 · cc84a09 · cc84a09
2 parents f5df9fe + 04e3bdb
commit cc84a09
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/tools/reproducible.Dockerfile b/tools/reproducible.Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get -y upgrade && DEBIAN_FRONTEND=noninteractive apt-g
                                                                                               zstd \
                                                                                               ;
 
-ARG _SPRING_CLANG_VERSION=17.0.2
+ARG _SPRING_CLANG_VERSION=18.1.8
 ARG _SPRING_LLVM_VERSION=11.1.0
 ARG _SPRING_CMAKE_VERSION=3.27.6
 
@@ -56,15 +56,17 @@ RUN tar xf cmake-*.tar.gz && \
     cd cmake*[0-9] && \
     echo 'set(CMAKE_USE_OPENSSL OFF CACHE BOOL "" FORCE)' > spring-init.cmake && \
     ./bootstrap --parallel=$(nproc) --init=spring-init.cmake --generator=Ninja && \
-    ninja install
+    ninja install && \
+    rm -rf cmake*
 
 RUN tar xf llvm-project-${_SPRING_CLANG_VERSION}.src.tar.xz && \
     cmake -S llvm-project-${_SPRING_CLANG_VERSION}.src/llvm -B build-toolchain -GNinja -DLLVM_INCLUDE_DOCS=Off -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release \
                                                                                      -DCMAKE_INSTALL_PREFIX=/pinnedtoolchain \
                                                                                      -DCOMPILER_RT_BUILD_SANITIZERS=Off \
                                                                                      -DLLVM_ENABLE_PROJECTS='lld;clang;clang-tools-extra' \
                                                                                      -DLLVM_ENABLE_RUNTIMES='compiler-rt;libc;libcxx;libcxxabi;libunwind' && \
-    cmake --build build-toolchain -t install
+    cmake --build build-toolchain -t install && \
+    rm -rf build*
 
 COPY <<-"EOF" /pinnedtoolchain/pinnedtoolchain.cmake
    set(CMAKE_C_COMPILER ${CMAKE_CURRENT_LIST_DIR}/bin/clang)
@@ -89,9 +91,8 @@ RUN tar xf llvm-project-${_SPRING_LLVM_VERSION}.src.tar.xz && \
     cmake -S llvm-project-${_SPRING_LLVM_VERSION}.src/llvm -B build-pinllvm -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=Off \
                                                                                   -DLLVM_ENABLE_RTTI=On -DLLVM_ENABLE_TERMINFO=Off -DLLVM_ENABLE_PIC=Off \
                                                                                   -DCMAKE_INSTALL_PREFIX=/pinnedtoolchain/pinllvm && \
-    cmake --build build-pinllvm -t install
-
-RUN rm -rf llvm* build* cmake*
+    cmake --build build-pinllvm -t install && \
+    rm -rf build* llvm*
 
 FROM builder AS build