[gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     e2de41bcd417a893ea7680399383b8596404733f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 20:04:04 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 20:04:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e2de41bc

Fix build issues reported by Nikoli.

PaX issues + unnecessary non-multilib llvm-config move.

---
 sys-devel/llvm/llvm-9999-r1.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 59c7350..dd3c24c 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -227,8 +227,10 @@ multilib_src_compile() {
 	fi
 
 	if use debug; then
+		pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
 		pax-mark m Debug+Asserts+Checks/bin/lli
 	else
+		pax-mark m Release/bin/llvm-rtdyld
 		pax-mark m Release/bin/lli
 	fi
 	if use test; then
@@ -259,7 +261,9 @@ multilib_src_install() {
 		emake "${mymakeopts[@]}" install
 
 		# Move files back.
-		mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
+		if path_exists -o "${ED}"/tmp/llvm-config.*; then
+			mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
+		fi
 	else
 		# we need to install libs for llvm, then whole clang
 		# since libs-only omits clang dir