@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)
17
17
# terminate when the right LLVM version is not found.
18
18
unset (LLVM_CONFIG_EXE CACHE )
19
19
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
21
21
PATHS
22
22
"/mingw64/bin"
23
23
"/c/msys64/mingw64/bin"
24
24
"c:/msys64/mingw64/bin"
25
- "C:/Libraries/llvm-18 .0.0/bin" )
25
+ "C:/Libraries/llvm-19 .0.0/bin" )
26
26
27
27
if ("${LLVM_CONFIG_EXE} " STREQUAL "LLVM_CONFIG_EXE-NOTFOUND" )
28
28
if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "" )
@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)
40
40
OUTPUT_STRIP_TRAILING_WHITESPACE)
41
41
42
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
44
# 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} " )
46
46
47
47
# Ignore this directory and try the search again
48
48
list (APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR} " )
@@ -63,12 +63,12 @@ if(ZIG_USE_LLVM_CONFIG)
63
63
ERROR_VARIABLE LLVM_CONFIG_ERROR
64
64
ERROR_STRIP_TRAILING_WHITESPACE)
65
65
66
- if (LLVM_CONFIG_ERROR)
66
+ if (LLVM_CONFIG_ERROR)
67
67
# Save the error message, in case this is the last llvm-config we find
68
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
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
72
endif ()
73
73
74
74
# Ignore this directory and try the search again
@@ -200,6 +200,7 @@ else()
200
200
FIND_AND_ADD_LLVM_LIB(LLVMTextAPIBinaryReader)
201
201
FIND_AND_ADD_LLVM_LIB(LLVMCoverage)
202
202
FIND_AND_ADD_LLVM_LIB(LLVMLineEditor)
203
+ FIND_AND_ADD_LLVM_LIB(LLVMSandboxIR)
203
204
FIND_AND_ADD_LLVM_LIB(LLVMXCoreDisassembler)
204
205
FIND_AND_ADD_LLVM_LIB(LLVMXCoreCodeGen)
205
206
FIND_AND_ADD_LLVM_LIB(LLVMXCoreDesc)
@@ -335,6 +336,7 @@ else()
335
336
FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerParallel)
336
337
FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerClassic)
337
338
FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinker)
339
+ FIND_AND_ADD_LLVM_LIB(LLVMCodeGenData)
338
340
FIND_AND_ADD_LLVM_LIB(LLVMGlobalISel)
339
341
FIND_AND_ADD_LLVM_LIB(LLVMMIRParser)
340
342
FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter)
0 commit comments