Rely on clang 3.9 for linker.

2 files changed, 23 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f79d2d7843c..494656053aee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
-# Generated by mksrcinfo v8
-# Thu Mar 10 19:41:09 UTC 2016
 pkgbase = cloudabi-clang
 	pkgdesc = Symlinks for the clang toolchain for CloudABI.
 	pkgver = 1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://clang.llvm.org/
 	arch = any
 	license = custom:LLVM
-	depends = clang>=3.7
-	depends = cloudabi-binutils
+	depends = clang>=3.9
+	conflicts = cloudabi-binutils
+	replaces = cloudabi-binutils
 
 pkgname = cloudabi-clang
 
diff --git a/PKGBUILD b/PKGBUILD
index b24be7b43964..3c4b5ef2d1f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,32 @@
 
 pkgname=cloudabi-clang
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Symlinks for the clang toolchain for CloudABI."
 url='http://clang.llvm.org/'
 arch=('any')
 depends=(
-	'clang>=3.7'
-	'cloudabi-binutils'
+	'clang>=3.9'
+	'lld>=3.9'
 )
+replaces=(cloudabi-binutils)
+conflicts=(cloudabi-binutils)
+provides=(cloudabi-binutils)
+
 license=(custom:LLVM)
 
+_make_links() {
+	local arch="$1"
+	ln -s clang "$pkgdir/usr/bin/$arch-unknown-cloudabi-cc"
+	ln -s clang "$pkgdir/usr/bin/$arch-unknown-cloudabi-c++"
+	ln -s lld   "$pkgdir/usr/bin/$arch-unknown-cloudabi-ld"
+}
+
 package() {
 	install -d "$pkgdir/usr/bin"
-	ln -s clang "$pkgdir/usr/bin/x86_64-unknown-cloudabi-cc"
-	ln -s clang "$pkgdir/usr/bin/x86_64-unknown-cloudabi-c++"
-	ln -s clang "$pkgdir/usr/bin/aarch64-unknown-cloudabi-cc"
-	ln -s clang "$pkgdir/usr/bin/aarch64-unknown-cloudabi-c++"
+
+	_make_links x86_64
+	_make_links i686
+	_make_links aarch64
+	_make_links armv6
 }