bump to llvm 22

Signed-off-by: David Korczynski <[email protected]>

Author: DavidKorczynski

infra/base-images/base-clang/Dockerfile

@@ -46,6 +46,7 @@ COPY checkout_build_install_llvm.sh /root/
 #COPY llvm-project $SRC/llvm-project
 # Keep all steps in the same script to decrease the number of intermediate
 # layes in docker file.
+#COPY llvm-project $SRC/llvm-project
 ARG FULL_LLVM_BUILD
 RUN FULL_LLVM_BUILD=$FULL_LLVM_BUILD /root/checkout_build_install_llvm.sh
 RUN rm /root/checkout_build_install_llvm.sh

infra/base-images/base-clang/checkout_build_install_llvm.sh

@@ -60,14 +60,16 @@ apt-get update && apt-get install -y $LLVM_DEP_PACKAGES --no-install-recommends
 # languages, projects, ...) is needed.
 # Check CMAKE_VERSION infra/base-images/base-clang/Dockerfile was released
 # recently enough to fully support this clang version.
-OUR_LLVM_REVISION=llvmorg-21.1.0-rc3
+#OUR_LLVM_REVISION=llvmorg-21.1.0-rc3
+OUR_LLVM_REVISION=cb2f0d0a5f14
 
 mkdir $SRC/chromium_tools
 cd $SRC/chromium_tools
 git clone https://chromium.googlesource.com/chromium/src/tools/clang
 cd clang
 # Pin clang script due to https://github.com/google/oss-fuzz/issues/7617
 OUR_CLANG_REVISION=329189001bce28e8f90dfa1c96075731a7a8f7de
+OUR_CLANG_REVISION=063d3766486a820c708e888d737b004d11543410
 git checkout $OUR_CLANG_REVISION
 
 LLVM_SRC=$SRC/llvm-project