authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-08-23 01:09:12+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-09-19 18:20:20-07:00
logdd095e506ab647e79b85541e23b3f696ce999d2f
treecd591245a57e6371e98762798ada3f7396a15e13
parent8b82a0e0fc5cac9a5376f06955ca4419b9a9923f

cmake: Update to LLVM 19.

Co-authored-by: David Rubin <daviru007@icloud.com>

4 files changed, 31 insertions(+), 30 deletions(-)

CMakeLists.txt+3-3
......@@ -137,9 +137,9 @@ else()
137137 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
138138endif()
139139
140find_package(llvm 18)
141find_package(clang 18)
142find_package(lld 18)
140find_package(llvm 19)
141find_package(clang 19)
142find_package(lld 19)
143143
144144if(ZIG_STATIC_ZLIB)
145145 if (MSVC)
cmake/Findclang.cmake+5-4
......@@ -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.18
21 libclang-cpp.so.18.1
22 clang-cpp-18.0
23 clang-cpp180
20 libclang-cpp.so.19
21 libclang-cpp.so.19.1
22 clang-cpp-19.0
23 clang-cpp190
2424 clang-cpp
2525 NAMES_PER_DIR
2626 HINTS "${LLVM_LIBDIRS}"
......@@ -68,6 +68,7 @@ else()
6868 FIND_AND_ADD_CLANG_LIB(clangToolingCore)
6969 FIND_AND_ADD_CLANG_LIB(clangExtractAPI)
7070 FIND_AND_ADD_CLANG_LIB(clangSupport)
71 FIND_AND_ADD_CLANG_LIB(clangInstallAPI)
7172endif()
7273
7374if (MSVC)
cmake/Findlld.cmake+16-16
......@@ -9,21 +9,21 @@
99find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
1010 HINTS ${LLVM_INCLUDE_DIRS}
1111 PATHS
12 /usr/lib/llvm-18/include
13 /usr/local/llvm180/include
14 /usr/local/llvm18/include
15 /usr/local/opt/llvm@18/include
16 /opt/homebrew/opt/llvm@18/include
12 /usr/lib/llvm-19/include
13 /usr/local/llvm190/include
14 /usr/local/llvm19/include
15 /usr/local/opt/llvm@19/include
16 /opt/homebrew/opt/llvm@19/include
1717 /mingw64/include)
1818
19find_library(LLD_LIBRARY NAMES lld-18.0 lld180 lld NAMES_PER_DIR
19find_library(LLD_LIBRARY NAMES lld-19.0 lld190 lld NAMES_PER_DIR
2020 HINTS ${LLVM_LIBDIRS}
2121 PATHS
22 /usr/lib/llvm-18/lib
23 /usr/local/llvm180/lib
24 /usr/local/llvm18/lib
25 /usr/local/opt/llvm@18/lib
26 /opt/homebrew/opt/llvm@18/lib
22 /usr/lib/llvm-19/lib
23 /usr/local/llvm190/lib
24 /usr/local/llvm19/lib
25 /usr/local/opt/llvm@19/lib
26 /opt/homebrew/opt/llvm@19/lib
2727)
2828if(EXISTS ${LLD_LIBRARY})
2929 set(LLD_LIBRARIES ${LLD_LIBRARY})
......@@ -34,11 +34,11 @@ else()
3434 HINTS ${LLVM_LIBDIRS}
3535 PATHS
3636 ${LLD_LIBDIRS}
37 /usr/lib/llvm-18/lib
38 /usr/local/llvm180/lib
39 /usr/local/llvm18/lib
40 /usr/local/opt/llvm@18/lib
41 /opt/homebrew/opt/llvm@18/lib
37 /usr/lib/llvm-19/lib
38 /usr/local/llvm190/lib
39 /usr/local/llvm19/lib
40 /usr/local/opt/llvm@19/lib
41 /opt/homebrew/opt/llvm@19/lib
4242 /mingw64/lib
4343 /c/msys64/mingw64/lib
4444 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+7-7
......@@ -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-18 llvm-config-18.0 llvm-config180 llvm-config18 llvm-config NAMES_PER_DIR
20 NAMES llvm-config-19 llvm-config-19.0 llvm-config190 llvm-config19 llvm-config NAMES_PER_DIR
2121 PATHS
2222 "/mingw64/bin"
2323 "/c/msys64/mingw64/bin"
2424 "c:/msys64/mingw64/bin"
25 "C:/Libraries/llvm-18.0.0/bin")
25 "C:/Libraries/llvm-19.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 18 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 19 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 19)
43 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 19 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 20 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 20)
4444 # Save the error message, in case this is the last llvm-config we find
45 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 18.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
45 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 19.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}")
......@@ -63,12 +63,12 @@ if(ZIG_USE_LLVM_CONFIG)
6363 ERROR_VARIABLE LLVM_CONFIG_ERROR
6464 ERROR_STRIP_TRAILING_WHITESPACE)
6565
66 if (LLVM_CONFIG_ERROR)
66 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 18.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")
69 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 19.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")
7070 else()
71 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 18.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")
71 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 19.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