authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-08-03 11:59:22+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-09-05 14:54:29+02:00
log40491be1a74cde7f13ac15d30838c0879971a8ab
treedf9ce9c6747cff3fddf57b5c341bebb418f76d75
parentd3b1e761ae8f9581e5f4a80433635176f8135840
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

build: update to LLVM 23

5 files changed, 47 insertions(+), 37 deletions(-)

CMakeLists.txt+3-3
......@@ -133,9 +133,9 @@ else()
133133 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
134134endif()
135135
136find_package(llvm 22)
137find_package(clang 22)
138find_package(lld 22)
136find_package(llvm 23)
137find_package(clang 23)
138find_package(lld 23)
139139
140140if(ZIG_STATIC_ZLIB)
141141 if (MSVC)
build.zig+8-4
......@@ -1350,20 +1350,23 @@ const clang_libs = [_][]const u8{
13501350 "clangStaticAnalyzerCheckers",
13511351 "clangStaticAnalyzerCore",
13521352 "clangCrossTU",
1353 "clangFrontend",
13541353 "clangDriver",
1354 "clangScalableStaticAnalysisAnalyses",
1355 "clangScalableStaticAnalysisCore",
1356 "clangScalableStaticAnalysisFrontend",
1357 "clangScalableStaticAnalysisSourceTransformation",
1358 "clangDependencyScanning",
1359 "clangFrontend",
13551360 "clangOptions",
13561361 "clangSerialization",
13571362 "clangSema",
13581363 "clangAnalysisLifetimeSafety",
13591364 "clangAnalysis",
13601365 "clangASTMatchers",
1361 "clangAST",
13621366 "clangParse",
1363 "clangSema",
13641367 "clangAPINotes",
1365 "clangBasic",
13661368 "clangEdit",
1369 "clangUnifiedSymbolResolution",
13671370 "clangLex",
13681371 "clangRewriteFrontend",
13691372 "clangRewrite",
......@@ -1375,6 +1378,7 @@ const clang_libs = [_][]const u8{
13751378 "clangSupport",
13761379 "clangInstallAPI",
13771380 "clangAST",
1381 "clangBasic",
13781382};
13791383const lld_libs = [_][]const u8{
13801384 "lldMinGW",
cmake/Findclang.cmake+11-5
......@@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
1717if(${LLVM_LINK_MODE} STREQUAL "shared")
1818 find_library(CLANG_LIBRARIES
1919 NAMES
20 libclang-cpp.so.22
21 libclang-cpp.so.22.1
22 clang-cpp-22.0
23 clang-cpp220
20 libclang-cpp.so.23
21 libclang-cpp.so.23.1
22 clang-cpp-23.0
23 clang-cpp230
2424 clang-cpp
2525 NAMES_PER_DIR
2626 HINTS "${LLVM_LIBDIRS}"
......@@ -48,8 +48,13 @@ else()
4848 FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
4949 FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
5050 FIND_AND_ADD_CLANG_LIB(clangCrossTU)
51 FIND_AND_ADD_CLANG_LIB(clangFrontend)
5251 FIND_AND_ADD_CLANG_LIB(clangDriver)
52 FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisAnalyses)
53 FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisCore)
54 FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisFrontend)
55 FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisSourceTransformation)
56 FIND_AND_ADD_CLANG_LIB(clangDependencyScanning)
57 FIND_AND_ADD_CLANG_LIB(clangFrontend)
5358 FIND_AND_ADD_CLANG_LIB(clangOptions)
5459 FIND_AND_ADD_CLANG_LIB(clangSerialization)
5560 FIND_AND_ADD_CLANG_LIB(clangSema)
......@@ -59,6 +64,7 @@ else()
5964 FIND_AND_ADD_CLANG_LIB(clangParse)
6065 FIND_AND_ADD_CLANG_LIB(clangAPINotes)
6166 FIND_AND_ADD_CLANG_LIB(clangEdit)
67 FIND_AND_ADD_CLANG_LIB(clangUnifiedSymbolResolution)
6268 FIND_AND_ADD_CLANG_LIB(clangLex)
6369 FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
6470 FIND_AND_ADD_CLANG_LIB(clangRewrite)
cmake/Findlld.cmake+19-19
......@@ -9,23 +9,23 @@
99find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
1010 HINTS ${LLVM_INCLUDE_DIRS}
1111 PATHS
12 /usr/lib/llvm-22/include
13 /usr/local/llvm220/include
14 /usr/local/llvm22/include
15 /usr/local/opt/lld@22/include
16 /opt/homebrew/opt/lld@22/include
17 /home/linuxbrew/.linuxbrew/opt/lld@22/include
12 /usr/lib/llvm-23/include
13 /usr/local/llvm230/include
14 /usr/local/llvm23/include
15 /usr/local/opt/lld@23/include
16 /opt/homebrew/opt/lld@23/include
17 /home/linuxbrew/.linuxbrew/opt/lld@23/include
1818 /mingw64/include)
1919
20find_library(LLD_LIBRARY NAMES lld-22.0 lld220 lld NAMES_PER_DIR
20find_library(LLD_LIBRARY NAMES lld-23.0 lld230 lld NAMES_PER_DIR
2121 HINTS ${LLVM_LIBDIRS}
2222 PATHS
23 /usr/lib/llvm-22/lib
24 /usr/local/llvm220/lib
25 /usr/local/llvm22/lib
26 /usr/local/opt/lld@22/lib
27 /opt/homebrew/opt/lld@22/lib
28 /home/linuxbrew/.linuxbrew/opt/lld@22/lib
23 /usr/lib/llvm-23/lib
24 /usr/local/llvm230/lib
25 /usr/local/llvm23/lib
26 /usr/local/opt/lld@23/lib
27 /opt/homebrew/opt/lld@23/lib
28 /home/linuxbrew/.linuxbrew/opt/lld@23/lib
2929)
3030if(EXISTS ${LLD_LIBRARY})
3131 set(LLD_LIBRARIES ${LLD_LIBRARY})
......@@ -36,12 +36,12 @@ else()
3636 HINTS ${LLVM_LIBDIRS}
3737 PATHS
3838 ${LLD_LIBDIRS}
39 /usr/lib/llvm-22/lib
40 /usr/local/llvm220/lib
41 /usr/local/llvm22/lib
42 /usr/local/opt/lld@22/lib
43 /opt/homebrew/opt/lld@22/lib
44 /home/linuxbrew/.linuxbrew/opt/lld@22/lib
39 /usr/lib/llvm-23/lib
40 /usr/local/llvm230/lib
41 /usr/local/llvm23/lib
42 /usr/local/opt/lld@23/lib
43 /opt/homebrew/opt/lld@23/lib
44 /home/linuxbrew/.linuxbrew/opt/lld@23/lib
4545 /mingw64/lib
4646 /c/msys64/mingw64/lib
4747 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+6-6
......@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)
1717 # terminate when the right LLVM version is not found.
1818 unset(LLVM_CONFIG_EXE CACHE)
1919 find_program(LLVM_CONFIG_EXE
20 NAMES llvm-config-22 llvm-config-22.0 llvm-config220 llvm-config22 llvm-config NAMES_PER_DIR
20 NAMES llvm-config-23 llvm-config-23.0 llvm-config230 llvm-config23 llvm-config NAMES_PER_DIR
2121 PATHS
2222 "/mingw64/bin"
2323 "/c/msys64/mingw64/bin"
2424 "c:/msys64/mingw64/bin"
25 "C:/Libraries/llvm-22.0.0/bin")
25 "C:/Libraries/llvm-23.0.0/bin")
2626
2727 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
2828 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")
......@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)
4040 OUTPUT_STRIP_TRAILING_WHITESPACE)
4141
4242 get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)
43 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 22 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 23 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 23)
43 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 23 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 24 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 24)
4444 # Save the error message, in case this is the last llvm-config we find
45 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 22.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
45 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 23.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
4646
4747 # Ignore this directory and try the search again
4848 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")
......@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)
6666 if (LLVM_CONFIG_ERROR)
6767 # Save the error message, in case this is the last llvm-config we find
6868 if (ZIG_SHARED_LLVM)
69 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 22.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")
69 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 23.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")
7070 else()
71 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 22.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")
71 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 23.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")
7272 endif()
7373
7474 # Ignore this directory and try the search again