1 files changed, 11 insertions, 10 deletions
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index 668ee739d0..19923dbc14 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=llvm
 pkgver=3.3
-pkgrel=0
+pkgrel=1
 pkgdesc="low level virtual machine compiler system"
 arch="x86 x86_64"
 url="http://llvm.org/"
@@ -14,7 +14,8 @@ install=
 subpackages="clang $pkgname-dev $pkgname-doc $pkgname-libs"
 source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
 	http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
-        llvm-3.3-alpine-linux.patch
+	llvm-3.3-alpine-linux.patch
+	llvm-musl.patch
 	"
 # clang hardcodes linker paths; and don't know of a fix like the --with-dynamic-linker
 # patch we use for gcc. So llvm-3.2-alpine-linux.patch needs to be updated if/when the
@@ -24,18 +25,13 @@ _builddir="$srcdir"/build
 _srcdir="$srcdir"/"$pkgname-$pkgver.src"
 
 prepare() {
-	mkdir "$_builddir"
-
 	msg "Preparing CLANG sources..."
-
 	mv "$srcdir"/cfe-$pkgver.src \
 		"$srcdir"/$pkgname-$pkgver.src/tools/clang || return 1
 
 	msg "Patching LLVM core..."
-
 	cd "$srcdir"/$pkgname-$pkgver.src || return 1
 	update_config_sub || return 1
-
 	for i in $source; do
 		case $i in
 		*.patch)
@@ -49,6 +45,7 @@ prepare() {
 }
 
 build() {
+	mkdir "$_builddir"
 	cd "$_builddir"
 
 	export CBUILD
@@ -67,6 +64,7 @@ build() {
 		--infodir=/usr/share/info \
 		--enable-ffi \
 		--enable-shared \
+		--enable-optimized \
 		|| return 1
 
 	# configure gets it wrong. We do have error_t
@@ -112,10 +110,13 @@ libs() {
 
 md5sums="40564e1dc390f9844f1711c08b08e391  llvm-3.3.src.tar.gz
 8284891e3e311829b8e44ac813d0c9ef  cfe-3.3.src.tar.gz
-5d5f4da3582349c9a8626cf55f8ac5e4  llvm-3.3-alpine-linux.patch"
+18f9165003a5b86101547d40ec5d3036  llvm-3.3-alpine-linux.patch
+517019fb4907cf5944c84315c681f905  llvm-musl.patch"
 sha256sums="68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578  llvm-3.3.src.tar.gz
 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996  cfe-3.3.src.tar.gz
-4c9a6b6838585ffe8d5ea063a1fa51514d407f9bb32ad56e859ed30c612fa641  llvm-3.3-alpine-linux.patch"
+5a6e40c7ffe280534ce964eaca5bc8ec325cb747f8de1390f534be2944c72361  llvm-3.3-alpine-linux.patch
+3b653520e79933058e9b4ab0943a364a87babe8e5e6b520ac15660c146302c74  llvm-musl.patch"
 sha512sums="1b7f7c5e907a68f642dcbe48fdff9585cb1504022bc9d386f310ebe5d25103d0d5f7cf0abf19e0e3fd666970160a98c90033754e2b79b2fac0cf866c984f8038  llvm-3.3.src.tar.gz
 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc  cfe-3.3.src.tar.gz
-4c177652bca81168e70ed37f95b337eea0fc4ad17ca8a5d77a018124aad89c06f851b92b9c89708b616fa37404a4a26f002dc035f6d4d7e22d97369d3fe71a95  llvm-3.3-alpine-linux.patch"
+d240f0fbef611b9863cbe1a79c10b4383dabf8be2ee49fd0f853d23fb0b4c935a41f3d50456a05815102834f2a4b1ac3c9334b444ed3868b7f3fb24e14ff14eb  llvm-3.3-alpine-linux.patch
+52f9791a11c103ff8d1a35e0fd94a9d8e1379fd6f8046e346f52686bb256ca969ead77059271931ac1fff5581146dd7e3862a3a14d85b96555b8823e807f2d70  llvm-musl.patch"