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()...@@ -137,9 +137,9 @@ else()
137 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")137 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
138endif()138endif()
139139
140find_package(llvm 18)140find_package(llvm 19)
141find_package(clang 18)141find_package(clang 19)
142find_package(lld 18)142find_package(lld 19)
143143
144if(ZIG_STATIC_ZLIB)144if(ZIG_STATIC_ZLIB)
145 if (MSVC)145 if (MSVC)
cmake/Findclang.cmake+5-4
...@@ -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.1820 libclang-cpp.so.19
21 libclang-cpp.so.18.121 libclang-cpp.so.19.1
22 clang-cpp-18.022 clang-cpp-19.0
23 clang-cpp18023 clang-cpp190
24 clang-cpp24 clang-cpp
25 NAMES_PER_DIR25 NAMES_PER_DIR
26 HINTS "${LLVM_LIBDIRS}"26 HINTS "${LLVM_LIBDIRS}"
...@@ -68,6 +68,7 @@ else()...@@ -68,6 +68,7 @@ else()
68 FIND_AND_ADD_CLANG_LIB(clangToolingCore)68 FIND_AND_ADD_CLANG_LIB(clangToolingCore)
69 FIND_AND_ADD_CLANG_LIB(clangExtractAPI)69 FIND_AND_ADD_CLANG_LIB(clangExtractAPI)
70 FIND_AND_ADD_CLANG_LIB(clangSupport)70 FIND_AND_ADD_CLANG_LIB(clangSupport)
71 FIND_AND_ADD_CLANG_LIB(clangInstallAPI)
71endif()72endif()
7273
73if (MSVC)74if (MSVC)
cmake/Findlld.cmake+16-16
...@@ -9,21 +9,21 @@...@@ -9,21 +9,21 @@
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-18/include12 /usr/lib/llvm-19/include
13 /usr/local/llvm180/include13 /usr/local/llvm190/include
14 /usr/local/llvm18/include14 /usr/local/llvm19/include
15 /usr/local/opt/llvm@18/include15 /usr/local/opt/llvm@19/include
16 /opt/homebrew/opt/llvm@18/include16 /opt/homebrew/opt/llvm@19/include
17 /mingw64/include)17 /mingw64/include)
1818
19find_library(LLD_LIBRARY NAMES lld-18.0 lld180 lld NAMES_PER_DIR19find_library(LLD_LIBRARY NAMES lld-19.0 lld190 lld NAMES_PER_DIR
20 HINTS ${LLVM_LIBDIRS}20 HINTS ${LLVM_LIBDIRS}
21 PATHS21 PATHS
22 /usr/lib/llvm-18/lib22 /usr/lib/llvm-19/lib
23 /usr/local/llvm180/lib23 /usr/local/llvm190/lib
24 /usr/local/llvm18/lib24 /usr/local/llvm19/lib
25 /usr/local/opt/llvm@18/lib25 /usr/local/opt/llvm@19/lib
26 /opt/homebrew/opt/llvm@18/lib26 /opt/homebrew/opt/llvm@19/lib
27)27)
28if(EXISTS ${LLD_LIBRARY})28if(EXISTS ${LLD_LIBRARY})
29 set(LLD_LIBRARIES ${LLD_LIBRARY})29 set(LLD_LIBRARIES ${LLD_LIBRARY})
...@@ -34,11 +34,11 @@ else()...@@ -34,11 +34,11 @@ else()
34 HINTS ${LLVM_LIBDIRS}34 HINTS ${LLVM_LIBDIRS}
35 PATHS35 PATHS
36 ${LLD_LIBDIRS}36 ${LLD_LIBDIRS}
37 /usr/lib/llvm-18/lib37 /usr/lib/llvm-19/lib
38 /usr/local/llvm180/lib38 /usr/local/llvm190/lib
39 /usr/local/llvm18/lib39 /usr/local/llvm19/lib
40 /usr/local/opt/llvm@18/lib40 /usr/local/opt/llvm@19/lib
41 /opt/homebrew/opt/llvm@18/lib41 /opt/homebrew/opt/llvm@19/lib
42 /mingw64/lib42 /mingw64/lib
43 /c/msys64/mingw64/lib43 /c/msys64/mingw64/lib
44 c:/msys64/mingw64/lib)44 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+7-7
...@@ -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-18 llvm-config-18.0 llvm-config180 llvm-config18 llvm-config NAMES_PER_DIR20 NAMES llvm-config-19 llvm-config-19.0 llvm-config190 llvm-config19 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-18.0.0/bin")25 "C:/Libraries/llvm-19.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 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)
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 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
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}")
...@@ -63,12 +63,12 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -63,12 +63,12 @@ if(ZIG_USE_LLVM_CONFIG)
63 ERROR_VARIABLE LLVM_CONFIG_ERROR63 ERROR_VARIABLE LLVM_CONFIG_ERROR
64 ERROR_STRIP_TRAILING_WHITESPACE)64 ERROR_STRIP_TRAILING_WHITESPACE)
6565
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 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")
70 else()70 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")
72 endif()72 endif()
7373
74 # Ignore this directory and try the search again74 # Ignore this directory and try the search again