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()...@@ -133,9 +133,9 @@ else()
133 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")133 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
134endif()134endif()
135135
136find_package(llvm 22)136find_package(llvm 23)
137find_package(clang 22)137find_package(clang 23)
138find_package(lld 22)138find_package(lld 23)
139139
140if(ZIG_STATIC_ZLIB)140if(ZIG_STATIC_ZLIB)
141 if (MSVC)141 if (MSVC)
build.zig+8-4
...@@ -1350,20 +1350,23 @@ const clang_libs = [_][]const u8{...@@ -1350,20 +1350,23 @@ const clang_libs = [_][]const u8{
1350 "clangStaticAnalyzerCheckers",1350 "clangStaticAnalyzerCheckers",
1351 "clangStaticAnalyzerCore",1351 "clangStaticAnalyzerCore",
1352 "clangCrossTU",1352 "clangCrossTU",
1353 "clangFrontend",
1354 "clangDriver",1353 "clangDriver",
1354 "clangScalableStaticAnalysisAnalyses",
1355 "clangScalableStaticAnalysisCore",
1356 "clangScalableStaticAnalysisFrontend",
1357 "clangScalableStaticAnalysisSourceTransformation",
1358 "clangDependencyScanning",
1359 "clangFrontend",
1355 "clangOptions",1360 "clangOptions",
1356 "clangSerialization",1361 "clangSerialization",
1357 "clangSema",1362 "clangSema",
1358 "clangAnalysisLifetimeSafety",1363 "clangAnalysisLifetimeSafety",
1359 "clangAnalysis",1364 "clangAnalysis",
1360 "clangASTMatchers",1365 "clangASTMatchers",
1361 "clangAST",
1362 "clangParse",1366 "clangParse",
1363 "clangSema",
1364 "clangAPINotes",1367 "clangAPINotes",
1365 "clangBasic",
1366 "clangEdit",1368 "clangEdit",
1369 "clangUnifiedSymbolResolution",
1367 "clangLex",1370 "clangLex",
1368 "clangRewriteFrontend",1371 "clangRewriteFrontend",
1369 "clangRewrite",1372 "clangRewrite",
...@@ -1375,6 +1378,7 @@ const clang_libs = [_][]const u8{...@@ -1375,6 +1378,7 @@ const clang_libs = [_][]const u8{
1375 "clangSupport",1378 "clangSupport",
1376 "clangInstallAPI",1379 "clangInstallAPI",
1377 "clangAST",1380 "clangAST",
1381 "clangBasic",
1378};1382};
1379const lld_libs = [_][]const u8{1383const lld_libs = [_][]const u8{
1380 "lldMinGW",1384 "lldMinGW",
cmake/Findclang.cmake+11-5
...@@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h...@@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
17if(${LLVM_LINK_MODE} STREQUAL "shared")17if(${LLVM_LINK_MODE} STREQUAL "shared")
18 find_library(CLANG_LIBRARIES18 find_library(CLANG_LIBRARIES
19 NAMES19 NAMES
20 libclang-cpp.so.2220 libclang-cpp.so.23
21 libclang-cpp.so.22.121 libclang-cpp.so.23.1
22 clang-cpp-22.022 clang-cpp-23.0
23 clang-cpp22023 clang-cpp230
24 clang-cpp24 clang-cpp
25 NAMES_PER_DIR25 NAMES_PER_DIR
26 HINTS "${LLVM_LIBDIRS}"26 HINTS "${LLVM_LIBDIRS}"
...@@ -48,8 +48,13 @@ else()...@@ -48,8 +48,13 @@ else()
48 FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)48 FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
49 FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)49 FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
50 FIND_AND_ADD_CLANG_LIB(clangCrossTU)50 FIND_AND_ADD_CLANG_LIB(clangCrossTU)
51 FIND_AND_ADD_CLANG_LIB(clangFrontend)
52 FIND_AND_ADD_CLANG_LIB(clangDriver)51 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)
53 FIND_AND_ADD_CLANG_LIB(clangOptions)58 FIND_AND_ADD_CLANG_LIB(clangOptions)
54 FIND_AND_ADD_CLANG_LIB(clangSerialization)59 FIND_AND_ADD_CLANG_LIB(clangSerialization)
55 FIND_AND_ADD_CLANG_LIB(clangSema)60 FIND_AND_ADD_CLANG_LIB(clangSema)
...@@ -59,6 +64,7 @@ else()...@@ -59,6 +64,7 @@ else()
59 FIND_AND_ADD_CLANG_LIB(clangParse)64 FIND_AND_ADD_CLANG_LIB(clangParse)
60 FIND_AND_ADD_CLANG_LIB(clangAPINotes)65 FIND_AND_ADD_CLANG_LIB(clangAPINotes)
61 FIND_AND_ADD_CLANG_LIB(clangEdit)66 FIND_AND_ADD_CLANG_LIB(clangEdit)
67 FIND_AND_ADD_CLANG_LIB(clangUnifiedSymbolResolution)
62 FIND_AND_ADD_CLANG_LIB(clangLex)68 FIND_AND_ADD_CLANG_LIB(clangLex)
63 FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)69 FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
64 FIND_AND_ADD_CLANG_LIB(clangRewrite)70 FIND_AND_ADD_CLANG_LIB(clangRewrite)
cmake/Findlld.cmake+19-19
...@@ -9,23 +9,23 @@...@@ -9,23 +9,23 @@
9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10 HINTS ${LLVM_INCLUDE_DIRS}10 HINTS ${LLVM_INCLUDE_DIRS}
11 PATHS11 PATHS
12 /usr/lib/llvm-22/include12 /usr/lib/llvm-23/include
13 /usr/local/llvm220/include13 /usr/local/llvm230/include
14 /usr/local/llvm22/include14 /usr/local/llvm23/include
15 /usr/local/opt/lld@22/include15 /usr/local/opt/lld@23/include
16 /opt/homebrew/opt/lld@22/include16 /opt/homebrew/opt/lld@23/include
17 /home/linuxbrew/.linuxbrew/opt/lld@22/include17 /home/linuxbrew/.linuxbrew/opt/lld@23/include
18 /mingw64/include)18 /mingw64/include)
1919
20find_library(LLD_LIBRARY NAMES lld-22.0 lld220 lld NAMES_PER_DIR20find_library(LLD_LIBRARY NAMES lld-23.0 lld230 lld NAMES_PER_DIR
21 HINTS ${LLVM_LIBDIRS}21 HINTS ${LLVM_LIBDIRS}
22 PATHS22 PATHS
23 /usr/lib/llvm-22/lib23 /usr/lib/llvm-23/lib
24 /usr/local/llvm220/lib24 /usr/local/llvm230/lib
25 /usr/local/llvm22/lib25 /usr/local/llvm23/lib
26 /usr/local/opt/lld@22/lib26 /usr/local/opt/lld@23/lib
27 /opt/homebrew/opt/lld@22/lib27 /opt/homebrew/opt/lld@23/lib
28 /home/linuxbrew/.linuxbrew/opt/lld@22/lib28 /home/linuxbrew/.linuxbrew/opt/lld@23/lib
29)29)
30if(EXISTS ${LLD_LIBRARY})30if(EXISTS ${LLD_LIBRARY})
31 set(LLD_LIBRARIES ${LLD_LIBRARY})31 set(LLD_LIBRARIES ${LLD_LIBRARY})
...@@ -36,12 +36,12 @@ else()...@@ -36,12 +36,12 @@ else()
36 HINTS ${LLVM_LIBDIRS}36 HINTS ${LLVM_LIBDIRS}
37 PATHS37 PATHS
38 ${LLD_LIBDIRS}38 ${LLD_LIBDIRS}
39 /usr/lib/llvm-22/lib39 /usr/lib/llvm-23/lib
40 /usr/local/llvm220/lib40 /usr/local/llvm230/lib
41 /usr/local/llvm22/lib41 /usr/local/llvm23/lib
42 /usr/local/opt/lld@22/lib42 /usr/local/opt/lld@23/lib
43 /opt/homebrew/opt/lld@22/lib43 /opt/homebrew/opt/lld@23/lib
44 /home/linuxbrew/.linuxbrew/opt/lld@22/lib44 /home/linuxbrew/.linuxbrew/opt/lld@23/lib
45 /mingw64/lib45 /mingw64/lib
46 /c/msys64/mingw64/lib46 /c/msys64/mingw64/lib
47 c:/msys64/mingw64/lib)47 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+6-6
...@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)
17 # terminate when the right LLVM version is not found.17 # terminate when the right LLVM version is not found.
18 unset(LLVM_CONFIG_EXE CACHE)18 unset(LLVM_CONFIG_EXE CACHE)
19 find_program(LLVM_CONFIG_EXE19 find_program(LLVM_CONFIG_EXE
20 NAMES llvm-config-22 llvm-config-22.0 llvm-config220 llvm-config22 llvm-config NAMES_PER_DIR20 NAMES llvm-config-23 llvm-config-23.0 llvm-config230 llvm-config23 llvm-config NAMES_PER_DIR
21 PATHS21 PATHS
22 "/mingw64/bin"22 "/mingw64/bin"
23 "/c/msys64/mingw64/bin"23 "/c/msys64/mingw64/bin"
24 "c:/msys64/mingw64/bin"24 "c:/msys64/mingw64/bin"
25 "C:/Libraries/llvm-22.0.0/bin")25 "C:/Libraries/llvm-23.0.0/bin")
2626
27 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")27 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
28 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")28 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")
...@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)
40 OUTPUT_STRIP_TRAILING_WHITESPACE)40 OUTPUT_STRIP_TRAILING_WHITESPACE)
4141
42 get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)42 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)
44 # Save the error message, in case this is the last llvm-config we find44 # 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
47 # Ignore this directory and try the search again47 # Ignore this directory and try the search again
48 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")48 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")
...@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)
66 if (LLVM_CONFIG_ERROR)66 if (LLVM_CONFIG_ERROR)
67 # Save the error message, in case this is the last llvm-config we find67 # Save the error message, in case this is the last llvm-config we find
68 if (ZIG_SHARED_LLVM)68 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")
70 else()70 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")
72 endif()72 endif()
7373
74 # Ignore this directory and try the search again74 # Ignore this directory and try the search again