From ce6d48c54853cbf7c68c758ed2105fca37cb03b5 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Mon, 21 Dec 2015 01:33:44 +0000
Subject: [PATCH] clang-svn: libcxx/libcxxabi fixes

---
 mingw-w64-clang-svn/PKGBUILD | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mingw-w64-clang-svn/PKGBUILD b/mingw-w64-clang-svn/PKGBUILD
index 4e4e1b2774..26edc2cfab 100644
--- a/mingw-w64-clang-svn/PKGBUILD
+++ b/mingw-w64-clang-svn/PKGBUILD
@@ -15,8 +15,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-analyzer-svn"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-tools-extra-svn"
          "${MINGW_PACKAGE_PREFIX}-compiler-rt-svn"
-         #"${MINGW_PACKAGE_PREFIX}-libc++abi-svn"
-         #"${MINGW_PACKAGE_PREFIX}-libc++-svn"
+         "${MINGW_PACKAGE_PREFIX}-libc++abi-svn"
+         "${MINGW_PACKAGE_PREFIX}-libc++-svn"
          "${MINGW_PACKAGE_PREFIX}-lld-svn"
          "${MINGW_PACKAGE_PREFIX}-llvm-svn"
         )
@@ -167,7 +167,7 @@ build() {
   # Disable automatic installation of components that go into subpackages
   sed -i '/\(clang\|lld\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake
   sed -i '/extra\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
-  sed -i '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake
+  sed -i '/\(compiler-rt\|libcxxabi\|libcxx\)\/cmake_install.cmake/d' projects/cmake_install.cmake
 }
 
 #check() {
@@ -209,7 +209,7 @@ package_llvm-svn() {
   make -C ../build-${CARCH}/projects/compiler-rt DESTDIR="$pkgdir" install
  }
 
-package_libcxxabi() {
+package_libcxxabi-svn() {
   pkgdesc="C++ Standard Library Support (mingw-w64)"
   url="http://libcxxabi.llvm.org/"
   provides=("${MINGW_PACKAGE_PREFIX}-libc++abi")
@@ -220,7 +220,7 @@ package_libcxxabi() {
   make -C ../build-${CARCH}/projects/libcxxabi -j1 DESTDIR="$pkgdir" install
 }
 
-package_libcxx() {
+package_libcxx-svn() {
   pkgdesc="C++ Standard Library (mingw-w64)"
   url="http://libcxx.llvm.org/"
   provides=("${MINGW_PACKAGE_PREFIX}-libc++")
@@ -228,7 +228,7 @@ package_libcxx() {
   pkgver=$(pkgver_internal "${srcdir}"/llvm/projects/libcxx)
 
   cd "$srcdir/llvm"
-   make -C ../build-${CARCH}/projects/libcxx -j1 DESTDIR="$pkgdir" install
+  make -C ../build-${CARCH}/projects/libcxx -j1 DESTDIR="$pkgdir" install
 }
 
 package_lldb-svn() {