From: Andreas Beckmann Date: Wed, 3 Feb 2021 20:21:03 +0000 (+0000) Subject: clang-9 has libclang-cpp, too X-Git-Tag: archive/raspbian/1.6-4+rpi1^2~13 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fbb0caba265bbf48d3407cb78a81f7ea1f21bfa8;p=pocl.git clang-9 has libclang-cpp, too Gbp-Pq: Name libclang-cpp.patch --- diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake index 2827d64..f60b674 100644 --- a/cmake/LLVM.cmake +++ b/cmake/LLVM.cmake @@ -239,8 +239,8 @@ string(STRIP "${LLVM_SYSLIBS}" LLVM_SYSLIBS) #################################################################### # llvm-config does not include clang libs -if((9 LESS LLVM_MAJOR) AND (NOT STATIC_LLVM)) - # For Clang 10+, link against a single shared library instead of multiple component shared +if((8 LESS LLVM_MAJOR) AND (NOT STATIC_LLVM)) + # For Clang 9+, link against a single shared library instead of multiple component shared # libraries. if("${LLVM_LIBNAMES}" MATCHES "LLVMTCE") set(CLANG_LIBNAMES clangTCE-cpp) @@ -257,7 +257,7 @@ endif() foreach(LIBNAME ${CLANG_LIBNAMES}) find_library(C_LIBFILE_${LIBNAME} NAMES "${LIBNAME}" HINTS "${LLVM_LIBDIR}") list(APPEND CLANG_LIBFILES "${C_LIBFILE_${LIBNAME}}") - if(UNIX AND (NOT APPLE)) + if(UNIX AND (NOT APPLE) AND (NOT ((8 LESS LLVM_MAJOR) AND (LLVM_LIB_IS_SHARED MATCHES "shared")))) set(LLVM_LDFLAGS "${LLVM_LDFLAGS} -Wl,--exclude-libs,lib${LIBNAME}") endif() endforeach()