no longer conflicts with lib32-llvm-libs

2 files changed, 2 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65f1960a8c2a..18fa5d841432 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-llvm-git
 	pkgdesc = Collection of modular and reusable compiler and toolchain technologies (32-bit, git)
-	pkgver = 11.0.0_r356627.2c512eaf378
+	pkgver = 12.0.0_r369840.68f47157164e
 	pkgrel = 1
 	url = https://llvm.org/
 	arch = x86_64
@@ -34,5 +34,4 @@ pkgname = lib32-llvm-libs-git
 	depends = lib32-zlib
 	provides = aur-lib32-llvm-libs-git
 	provides = lib32-llvm-libs
-	conflicts = lib32-llvm-libs
 
diff --git a/PKGBUILD b/PKGBUILD
index 2b56b480c836..3b7e85ff9794 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 pkgbase=lib32-llvm-git
 pkgname=(lib32-llvm-git lib32-llvm-libs-git)
 pkgdesc="Collection of modular and reusable compiler and toolchain technologies (32-bit, git)"
-pkgver=11.0.0_r356627.2c512eaf378
+pkgver=12.0.0_r369840.68f47157164e
 pkgrel=1
 arch=('x86_64')
 url='https://llvm.org/'
@@ -121,20 +121,13 @@ conflicts=('lib32-llvm' 'lib32-clang')
 package_lib32-llvm-libs-git() {
     depends=('lib32-gcc-libs' 'lib32-libffi' 'lib32-libxml2' 'lib32-ncurses' 'lib32-zlib')
 provides=('aur-lib32-llvm-libs-git' 'lib32-llvm-libs')
-conflicts=('lib32-llvm-libs')
     
     install -d "$pkgdir/usr/lib32"
 
     cp -P \
         "$srcdir"/lib{LLVM,LTO,Remarks}*.so* \
-        "$srcdir"/LLVMgold.so \
         "$pkgdir/usr/lib32/"
 
-    # Symlink LLVMgold.so from /usr/lib/bfd-plugins
-    # https://bugs.archlinux.org/task/28479
-    install -d "$pkgdir/usr/lib32/bfd-plugins"
-    ln -s ../LLVMgold.so "$pkgdir/usr/lib32/bfd-plugins/LLVMgold.so"
-
     cd "$srcdir"/llvm-project/
     install -D -m 0644 llvm/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
     install -Dm644 clang/LICENSE.TXT "$pkgdir"/usr/share/licenses/$pkgname/clang-LICENSE