authorgravatar for alex_naskos@hotmail.comAlexandros Naskos <alex_naskos@hotmail.com> 2020-10-02 17:02:08+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-10-02 17:02:08+03:00
loge9434ff8f46ec27a863d0b071c0a99b4f01588dc
treeea800a47961e2343c0b220f0a034c802230bb609
parent55eb7c16c00d333837a9cc1472ca99fafd61a9b8
parent99c5d2d59053f647c041f71d75ee50f51a610977
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #6430 from jedisct1/llvm-config

Print the llvm-config path on configuration error

1 files changed, 4 insertions(+), 4 deletions(-)

cmake/Findllvm.cmake+4-4
...@@ -55,13 +55,13 @@ elseif("${ZIG_TARGET_TRIPLE}" STREQUAL "native")...@@ -55,13 +55,13 @@ elseif("${ZIG_TARGET_TRIPLE}" STREQUAL "native")
55 OUTPUT_STRIP_TRAILING_WHITESPACE)55 OUTPUT_STRIP_TRAILING_WHITESPACE)
5656
57 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 10)57 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 10)
58 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}")58 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
59 endif()59 endif()
60 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 11)60 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 11)
61 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}")61 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
62 endif()62 endif()
63 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 11)63 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 11)
64 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}")64 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
65 endif()65 endif()
6666
67 execute_process(67 execute_process(
...@@ -72,7 +72,7 @@ elseif("${ZIG_TARGET_TRIPLE}" STREQUAL "native")...@@ -72,7 +72,7 @@ elseif("${ZIG_TARGET_TRIPLE}" STREQUAL "native")
72 function(NEED_TARGET TARGET_NAME)72 function(NEED_TARGET TARGET_NAME)
73 list (FIND LLVM_TARGETS_BUILT "${TARGET_NAME}" _index)73 list (FIND LLVM_TARGETS_BUILT "${TARGET_NAME}" _index)
74 if (${_index} EQUAL -1)74 if (${_index} EQUAL -1)
75 message(FATAL_ERROR "LLVM is missing target ${TARGET_NAME}. Zig requires LLVM to be built with all default targets enabled.")75 message(FATAL_ERROR "LLVM (according to ${LLVM_CONFIG_EXE}) is missing target ${TARGET_NAME}. Zig requires LLVM to be built with all default targets enabled.")
76 endif()76 endif()
77 endfunction(NEED_TARGET)77 endfunction(NEED_TARGET)
78 NEED_TARGET("AArch64")78 NEED_TARGET("AArch64")