From e2f656e3cc484a7d89a72debf438d43f3c9db9c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@users.noreply.github.com>
Date: Sun, 24 Sep 2017 19:07:18 +0200
Subject: [PATCH] clang: don't link polly into LLVM tools (#2955)

Signed-off-by: Mateusz Mikula <mati865@gmail.com>
---
 mingw-w64-clang/PKGBUILD | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD
index ef3afffd77..e5c8075b24 100644
--- a/mingw-w64-clang/PKGBUILD
+++ b/mingw-w64-clang/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-lldb"
          "${MINGW_PACKAGE_PREFIX}-polly")
 pkgver=5.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="C language family frontend for LLVM (mingw-w64)"
 arch=('any')
 url="https://llvm.org/"
@@ -144,7 +144,7 @@ prepare() {
   patch -p1 -i "${srcdir}/0003-Globally-provide-DESTDIR-for-all-platforms.patch"
   patch -p1 -i "${srcdir}/0004-llvm-config-look-for-unversioned-shared-lib-on-win32.patch"
   patch -p1 -i "${srcdir}/0005-add-pthread-as-system-lib-for-mingw.patch"
-  patch -p1 -i "${srcdir}/0006-fix-bugpoint-multiple-definition.patch"
+  #patch -p1 -i "${srcdir}/0006-fix-bugpoint-multiple-definition.patch"
 
   cd "${srcdir}/cfe-${pkgver}.src"
   patch -p1 -i "${srcdir}/0101-Allow-build-static-clang-library-for-mingw.patch"
@@ -176,6 +176,7 @@ prepare() {
   #cd "${srcdir}/libcxxabi-${pkgver}.src"
 
   cd "${srcdir}/polly-${pkgver}.src"
+  # With LLVM_LINK_LLVM_DYLIB=ON it's build before LLVM and fails with undefined references to LLVM functions
   patch -p1 -i "${srcdir}/0801-Don-t-build-LLVMPolly-on-WIN32.patch"
 
   # At the present, clang must reside inside the LLVM source code tree to build
@@ -247,6 +248,7 @@ build() {
     -DLIBCXXABI_ENABLE_SHARED=OFF \
     -DLIBUNWIND_ENABLE_SHARED=OFF \
     -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
+    -DLLVM_POLLY_LINK_INTO_TOOLS=OFF \
     "${extra_config[@]}" \
     ../llvm-${pkgver}.src
 
@@ -265,6 +267,8 @@ build() {
 #  cd "${srcdir}"/build-${CARCH}
 #  # Remove || true once testcase doesn't cause failures.
 #  make check || true
+#  make check-clang || true
+#  make check-polly || true
 #}
 
 package_llvm() {