Don't remove the libs, symlink them

2 files changed, 8 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 213072f07f58..7e91421dc7c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Nov 24 15:46:14 UTC 2016
+# Thu Nov 24 15:56:27 UTC 2016
 pkgbase = rust-nightly-bin
 	pkgdesc = Fast, concurrent, safe. The Rust programming language and its package manager, Cargo.
 	pkgver = 1.15.0_2016.11.22
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.rust-lang.org/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index f4a9dc3c51fb..38293c6f374f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _date=2016-11-23
 pkgname=rust-nightly-bin
 pkgver=1.15.0_2016.11.22
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc='Fast, concurrent, safe. The Rust programming language and its package manager, Cargo.'
 url='https://www.rust-lang.org/'
@@ -47,6 +47,9 @@ package() {
 
     # Remove cruft.
     rm "${pkgdir}/usr/lib/rustlib/"{manifest-*,install.log,uninstall.sh,components,rust-installer-version}
-    # Remove duplicate .so libraries (only need rlibs in rustlib).
-    find "${pkgdir}/usr/lib/rustlib/" -name "*.so" -delete
+
+    # Remove duplicate .so libraries and symlink to them.
+    # https://github.com/rust-lang/rust/issues/37971
+    find "${pkgdir}/usr/lib/rustlib/" -name "*.so" -exec ln -rfs -t "${pkgdir}/usr/lib/" {} +
+
 }