| ... | @@ -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_EXE | 19 | find_program(LLVM_CONFIG_EXE |
| 20 | NAMES llvm-config-19 llvm-config-19.0 llvm-config190 llvm-config19 llvm-config NAMES_PER_DIR | 20 | NAMES llvm-config-20 llvm-config-20.0 llvm-config200 llvm-config20 llvm-config NAMES_PER_DIR |
| 21 | PATHS | 21 | 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-19.0.0/bin") | 25 | "C:/Libraries/llvm-20.0.0/bin") |
| 26 | | 26 | |
| 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) |
| 41 | | 41 | |
| 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 19 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 20 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 20) | 43 | if("${LLVM_CONFIG_VERSION}" VERSION_LESS 20 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 21 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 21) |
| 44 | # Save the error message, in case this is the last llvm-config we find | 44 | # Save the error message, in case this is the last llvm-config we find |
| 45 | list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 19.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}") | 45 | list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 20.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}") |
| 46 | | 46 | |
| 47 | # Ignore this directory and try the search again | 47 | # 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 find | 67 | # 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 19.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library") | 69 | list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 20.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 19.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library") | 71 | list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 20.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library") |
| 72 | endif() | 72 | endif() |
| 73 | | 73 | |
| 74 | # Ignore this directory and try the search again | 74 | # Ignore this directory and try the search again |
| ... | @@ -197,10 +197,10 @@ else() | ... | @@ -197,10 +197,10 @@ else() |
| 197 | FIND_AND_ADD_LLVM_LIB(LLVMXRay) | 197 | FIND_AND_ADD_LLVM_LIB(LLVMXRay) |
| 198 | FIND_AND_ADD_LLVM_LIB(LLVMLibDriver) | 198 | FIND_AND_ADD_LLVM_LIB(LLVMLibDriver) |
| 199 | FIND_AND_ADD_LLVM_LIB(LLVMDlltoolDriver) | 199 | FIND_AND_ADD_LLVM_LIB(LLVMDlltoolDriver) |
| | 200 | FIND_AND_ADD_LLVM_LIB(LLVMTelemetry) |
| 200 | FIND_AND_ADD_LLVM_LIB(LLVMTextAPIBinaryReader) | 201 | FIND_AND_ADD_LLVM_LIB(LLVMTextAPIBinaryReader) |
| 201 | FIND_AND_ADD_LLVM_LIB(LLVMCoverage) | 202 | FIND_AND_ADD_LLVM_LIB(LLVMCoverage) |
| 202 | FIND_AND_ADD_LLVM_LIB(LLVMLineEditor) | 203 | FIND_AND_ADD_LLVM_LIB(LLVMLineEditor) |
| 203 | FIND_AND_ADD_LLVM_LIB(LLVMSandboxIR) | | |
| 204 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreDisassembler) | 204 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreDisassembler) |
| 205 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreCodeGen) | 205 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreCodeGen) |
| 206 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreDesc) | 206 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreDesc) |
| ... | @@ -227,6 +227,10 @@ else() | ... | @@ -227,6 +227,10 @@ else() |
| 227 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZCodeGen) | 227 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZCodeGen) |
| 228 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZDesc) | 228 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZDesc) |
| 229 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZInfo) | 229 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZInfo) |
| | 230 | FIND_AND_ADD_LLVM_LIB(LLVMSPIRVCodeGen) |
| | 231 | FIND_AND_ADD_LLVM_LIB(LLVMSPIRVDesc) |
| | 232 | FIND_AND_ADD_LLVM_LIB(LLVMSPIRVInfo) |
| | 233 | FIND_AND_ADD_LLVM_LIB(LLVMSPIRVAnalysis) |
| 230 | FIND_AND_ADD_LLVM_LIB(LLVMSparcDisassembler) | 234 | FIND_AND_ADD_LLVM_LIB(LLVMSparcDisassembler) |
| 231 | FIND_AND_ADD_LLVM_LIB(LLVMSparcAsmParser) | 235 | FIND_AND_ADD_LLVM_LIB(LLVMSparcAsmParser) |
| 232 | FIND_AND_ADD_LLVM_LIB(LLVMSparcCodeGen) | 236 | FIND_AND_ADD_LLVM_LIB(LLVMSparcCodeGen) |
| ... | @@ -325,6 +329,7 @@ else() | ... | @@ -325,6 +329,7 @@ else() |
| 325 | FIND_AND_ADD_LLVM_LIB(LLVMCoroutines) | 329 | FIND_AND_ADD_LLVM_LIB(LLVMCoroutines) |
| 326 | FIND_AND_ADD_LLVM_LIB(LLVMipo) | 330 | FIND_AND_ADD_LLVM_LIB(LLVMipo) |
| 327 | FIND_AND_ADD_LLVM_LIB(LLVMVectorize) | 331 | FIND_AND_ADD_LLVM_LIB(LLVMVectorize) |
| | 332 | FIND_AND_ADD_LLVM_LIB(LLVMSandboxIR) |
| 328 | FIND_AND_ADD_LLVM_LIB(LLVMLinker) | 333 | FIND_AND_ADD_LLVM_LIB(LLVMLinker) |
| 329 | FIND_AND_ADD_LLVM_LIB(LLVMInstrumentation) | 334 | FIND_AND_ADD_LLVM_LIB(LLVMInstrumentation) |
| 330 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenMP) | 335 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenMP) |
| ... | @@ -332,11 +337,11 @@ else() | ... | @@ -332,11 +337,11 @@ else() |
| 332 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenACC) | 337 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenACC) |
| 333 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendHLSL) | 338 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendHLSL) |
| 334 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendDriver) | 339 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendDriver) |
| | 340 | FIND_AND_ADD_LLVM_LIB(LLVMFrontendAtomic) |
| 335 | FIND_AND_ADD_LLVM_LIB(LLVMExtensions) | 341 | FIND_AND_ADD_LLVM_LIB(LLVMExtensions) |
| 336 | FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerParallel) | 342 | FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerParallel) |
| 337 | FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerClassic) | 343 | FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerClassic) |
| 338 | FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinker) | 344 | FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinker) |
| 339 | FIND_AND_ADD_LLVM_LIB(LLVMCodeGenData) | | |
| 340 | FIND_AND_ADD_LLVM_LIB(LLVMGlobalISel) | 345 | FIND_AND_ADD_LLVM_LIB(LLVMGlobalISel) |
| 341 | FIND_AND_ADD_LLVM_LIB(LLVMMIRParser) | 346 | FIND_AND_ADD_LLVM_LIB(LLVMMIRParser) |
| 342 | FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter) | 347 | FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter) |
| ... | @@ -345,6 +350,7 @@ else() | ... | @@ -345,6 +350,7 @@ else() |
| 345 | FIND_AND_ADD_LLVM_LIB(LLVMTarget) | 350 | FIND_AND_ADD_LLVM_LIB(LLVMTarget) |
| 346 | FIND_AND_ADD_LLVM_LIB(LLVMObjCARCOpts) | 351 | FIND_AND_ADD_LLVM_LIB(LLVMObjCARCOpts) |
| 347 | FIND_AND_ADD_LLVM_LIB(LLVMCodeGenTypes) | 352 | FIND_AND_ADD_LLVM_LIB(LLVMCodeGenTypes) |
| | 353 | FIND_AND_ADD_LLVM_LIB(LLVMCGData) |
| 348 | FIND_AND_ADD_LLVM_LIB(LLVMIRPrinter) | 354 | FIND_AND_ADD_LLVM_LIB(LLVMIRPrinter) |
| 349 | FIND_AND_ADD_LLVM_LIB(LLVMInterfaceStub) | 355 | FIND_AND_ADD_LLVM_LIB(LLVMInterfaceStub) |
| 350 | FIND_AND_ADD_LLVM_LIB(LLVMFileCheck) | 356 | FIND_AND_ADD_LLVM_LIB(LLVMFileCheck) |
| ... | @@ -360,6 +366,7 @@ else() | ... | @@ -360,6 +366,7 @@ else() |
| 360 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoBTF) | 366 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoBTF) |
| 361 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoPDB) | 367 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoPDB) |
| 362 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF) | 368 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF) |
| | 369 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoCodeView) |
| 363 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF) | 370 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF) |
| 364 | FIND_AND_ADD_LLVM_LIB(LLVMObject) | 371 | FIND_AND_ADD_LLVM_LIB(LLVMObject) |
| 365 | FIND_AND_ADD_LLVM_LIB(LLVMTextAPI) | 372 | FIND_AND_ADD_LLVM_LIB(LLVMTextAPI) |
| ... | @@ -367,7 +374,6 @@ else() | ... | @@ -367,7 +374,6 @@ else() |
| 367 | FIND_AND_ADD_LLVM_LIB(LLVMIRReader) | 374 | FIND_AND_ADD_LLVM_LIB(LLVMIRReader) |
| 368 | FIND_AND_ADD_LLVM_LIB(LLVMAsmParser) | 375 | FIND_AND_ADD_LLVM_LIB(LLVMAsmParser) |
| 369 | FIND_AND_ADD_LLVM_LIB(LLVMMC) | 376 | FIND_AND_ADD_LLVM_LIB(LLVMMC) |
| 370 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoCodeView) | | |
| 371 | FIND_AND_ADD_LLVM_LIB(LLVMBitReader) | 377 | FIND_AND_ADD_LLVM_LIB(LLVMBitReader) |
| 372 | FIND_AND_ADD_LLVM_LIB(LLVMFuzzerCLI) | 378 | FIND_AND_ADD_LLVM_LIB(LLVMFuzzerCLI) |
| 373 | FIND_AND_ADD_LLVM_LIB(LLVMCore) | 379 | FIND_AND_ADD_LLVM_LIB(LLVMCore) |
Alex Rønne Petersen <alex@alexrp.com> 2025-02-05 10:15:15+01:00
Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM