From f2575c7935fb366adfc5f3edefc13222625a430f Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexey.pawlow@gmail.com>
Date: Sat, 26 Dec 2015 08:26:44 +0300
Subject: [PATCH] clang: Fix PKGBUILD

---
 mingw-w64-clang/PKGBUILD | 63 ++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD
index 0a551a219c..d95193c503 100644
--- a/mingw-w64-clang/PKGBUILD
+++ b/mingw-w64-clang/PKGBUILD
@@ -206,9 +206,43 @@ package_clang(){
   cd "${srcdir}"/llvm-${pkgver}.src
   make -C ../build-${CARCH}/tools/clang DESTDIR="${pkgdir}" install
   
-  # Not sure why this isn't getting installed ..
-  cp ../build-${CARCH}/bin/clang++.exe ${pkgdir}${MINGW_PREFIX}/bin/
-  cp -f ${srcdir}/build-${CARCH}/lib/libclang.a ${pkgdir}${MINGW_PREFIX}/lib/
+  cp -f ../build-${CARCH}/lib/libclang.a ${pkgdir}${MINGW_PREFIX}/lib/
+}
+
+package_clang-analyzer() {
+  pkgdesc="A source code analysis framework (mingw-w64)"
+  url="http://clang-analyzer.llvm.org/"
+  depends=("${MINGW_PACKAGE_PREFIX}-clang=${pkgver}-${pkgrel}" "${MINGW_PACKAGE_PREFIX}-python2")
+
+  #cd "${srcdir}/llvm-${pkgver}.src"
+  #make -C ../build-${CARCH}/tools/clang/tools/scan-build -j1 DESTDIR="$pkgdir" install
+  #make -C ../build-${CARCH}/tools/clang/tools/scan-view -j1 DESTDIR="$pkgdir" install
+  cd "${srcdir}/llvm-${pkgver}.src/tools/clang"
+  install -d "${pkgdir}"${MINGW_PREFIX}/{bin,lib/clang-analyzer}
+  for _tool in scan-{build,view}; do
+    cp -r tools/${_tool} "${pkgdir}"${MINGW_PREFIX}/lib/clang-analyzer/
+    ln -s "${pkgdir}"${MINGW_PREFIX}/lib/clang-analyzer/${_tool}/${_tool} "${pkgdir}"${MINGW_PREFIX}/bin/
+  done
+
+  # scan-build looks for clang within the same directory
+  install -d "${pkgdir}"${MINGW_PREFIX}/lib/clang-analyzer/scan-build/
+  ln -s "${srcdir}"/build-${CARCH}/bin/clang.exe "${pkgdir}"${MINGW_PREFIX}/lib/clang-analyzer/scan-build/
+
+  # Relocate man page
+  install -d "${pkgdir}"${MINGW_PREFIX}/share/man/man1
+  mv "${pkgdir}"${MINGW_PREFIX}/lib/clang-analyzer/scan-build/scan-build.1 \
+     "${pkgdir}"${MINGW_PREFIX}/share/man/man1/
+
+  # Use Python 2
+  sed -i \
+    -e 's|env python$|&2|' \
+    -e 's|/usr/bin/python$|&2|' \
+    "${pkgdir}"${MINGW_PREFIX}/bin/scan-view
+
+  # Compile Python scripts
+  #python2 -m compileall "${pkgdir}"${MINGW_PREFIX}/bin/clang-analyzer
+  python2 -O -m compileall "${pkgdir}"${MINGW_PREFIX}/lib/clang-analyzer
+  install -Dm644 LICENSE.TXT "${pkgdir}"${MINGW_PREFIX}/share/licenses/clang-analyzer/LICENSE
 }
 
 package_clang-tools-extra() {
@@ -248,7 +282,7 @@ package_lld(){
   depends=("${MINGW_PACKAGE_PREFIX}-llvm=${pkgver}-${pkgrel}")
 
   cd "$srcdir"/llvm-${pkgver}.src
-  make -j1 DESTDIR="${pkgdir}" rebuild_cache install
+  make -C ../build-${CARCH}/tools/lld -j1 DESTDIR="${pkgdir}" install
 }
 
 package_lldb() {
@@ -287,27 +321,6 @@ package_llvm(){
   install -Dm755 "${srcdir}"/build-${CARCH}/bin/FileCheck.exe                    "${pkgdir}${MINGW_PREFIX}/bin/FileCheck.exe"
 }
 
-package_clang-analyzer() {
-  pkgdesc="A source code analysis framework (mingw-w64)"
-  url="http://clang-analyzer.llvm.org/"
-  depends=("${MINGW_PACKAGE_PREFIX}-clang=${pkgver}-${pkgrel}" "${MINGW_PACKAGE_PREFIX}-python2")
-
-  cd "${srcdir}/llvm-${pkgver}.src"
-  make -C ../build-${CARCH}/tools/clang/tools/scan-build -j1 DESTDIR="$pkgdir" install
-  make -C ../build-${CARCH}/tools/clang/tools/scan-view -j1 DESTDIR="$pkgdir" install
-
-  # Use Python 2
-  sed -i \
-    -e 's|env python$|&2|' \
-    -e 's|/usr/bin/python$|&2|' \
-    "${pkgdir}"${MINGW_PREFIX}/bin/scan-view
-
-  # Compile Python scripts
-  python2 -m compileall "${pkgdir}"${MINGW_PREFIX}/bin/clang-analyzer
-  python2 -O -m compileall "${pkgdir}"${MINGW_PREFIX}/lib/clang-analyzer
-  install -Dm644 LICENSE.TXT "${pkgdir}"${MINGW_PREFIX}/share/licenses/clang-analyzer/LICENSE
-}
-
 package_mingw-w64-i686-clang(){
   package_clang
 }