From 4a921b2eba294518c19b7ad71f0b3bd9a4c6522b Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sat, 17 Mar 2018 18:39:58 +0100 Subject: [PATCH 1/2] add CLANG_LIBDIRS cmake build variable Mirrors LLVM_LIBDIRS, tells cmake where to look for libclang libraries. --- cmake/Findclang.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index 26617d36fc..b42abd10a3 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -5,6 +5,7 @@ # CLANG_FOUND # CLANG_INCLUDE_DIRS # CLANG_LIBRARIES +# CLANG_LIBDIRS if(MSVC) find_package(CLANG REQUIRED CONFIG) @@ -34,6 +35,7 @@ else() string(TOUPPER ${_libname_} _prettylibname_) find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} PATHS + ${CLANG_LIBDIRS} /usr/lib/llvm/6/lib /usr/lib/llvm-6.0/lib /mingw64/lib @@ -60,4 +62,4 @@ endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CLANG DEFAULT_MSG CLANG_LIBRARIES CLANG_INCLUDE_DIRS) -mark_as_advanced(CLANG_INCLUDE_DIRS CLANG_LIBRARIES) +mark_as_advanced(CLANG_INCLUDE_DIRS CLANG_LIBRARIES CLANG_LIBDIRS) From c2c34c09b9afd8a5370dce771d5e98af5b3303a1 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sat, 17 Mar 2018 18:39:58 +0100 Subject: [PATCH 2/2] add LLVM_LIBDIRS to link directories This seems to be the only way to get the zig build to link against llvm libraries in a non-standard location. --- cmake/Findllvm.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index d0a4a3cba8..296e0a91f7 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -66,7 +66,7 @@ if(NOT LLVM_LIBRARIES) endif() link_directories("${CMAKE_PREFIX_PATH}/lib") - +link_directories("${LLVM_LIBDIRS}") include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIRS)