From: Andreas Beckmann <anbe@debian.org>
Date: Tue, 7 Apr 2020 23:33:12 +0000 (+0200)
Subject: [PATCH 02/10] link against single shared libclang-cpp when building with llvm 9, too
X-Git-Tag: archive/raspbian/3.0-8+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ebe7e0393c46ecdc7fef0c9c99c75b8a1c2da2d;p=pocl.git

[PATCH 02/10] link against single shared libclang-cpp when building with llvm 9, too


Gbp-Pq: Name 2002-link-against-single-shared-libclang-cpp-when-buildin.patch
---

diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
index 2b8b37c..567df57 100644
--- a/cmake/LLVM.cmake
+++ b/cmake/LLVM.cmake
@@ -270,8 +270,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)
@@ -288,7 +288,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 (NOT STATIC_LLVM))))
     set(LLVM_LDFLAGS "${LLVM_LDFLAGS} -Wl,--exclude-libs,lib${LIBNAME}")
   endif()
 endforeach()