@@ -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
@@ -200,6 +200,7 @@ else()
200200 FIND_AND_ADD_LLVM_LIB(LLVMTextAPIBinaryReader)
201201 FIND_AND_ADD_LLVM_LIB(LLVMCoverage)
202202 FIND_AND_ADD_LLVM_LIB(LLVMLineEditor)
203+ FIND_AND_ADD_LLVM_LIB(LLVMSandboxIR)
203204 FIND_AND_ADD_LLVM_LIB(LLVMXCoreDisassembler)
204205 FIND_AND_ADD_LLVM_LIB(LLVMXCoreCodeGen)
205206 FIND_AND_ADD_LLVM_LIB(LLVMXCoreDesc)
@@ -335,6 +336,7 @@ else()
335336 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerParallel)
336337 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerClassic)
337338 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinker)
339+ FIND_AND_ADD_LLVM_LIB(LLVMCodeGenData)
338340 FIND_AND_ADD_LLVM_LIB(LLVMGlobalISel)
339341 FIND_AND_ADD_LLVM_LIB(LLVMMIRParser)
340342 FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter)
0 commit comments