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

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

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

Fix more of missing 'use clang'.

---
 sys-devel/llvm/llvm-9999-r1.ebuild | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 04924ea..c17f814 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -220,7 +220,7 @@ multilib_src_compile() {
 		# since libs-only omits clang dir
 		# and clang fails to sub-compile with libs-only.
 		emake "${mymakeopts[@]}" libs-only
-		emake -C tools/clang "${mymakeopts[@]}"
+		use clang && emake -C tools/clang "${mymakeopts[@]}"
 	fi
 
 	if multilib_is_native_abi; then
@@ -245,14 +245,21 @@ multilib_src_compile() {
 multilib_src_test() {
 	default
 
-	emake -C tools/clang test
+	use clang && emake -C tools/clang test
 }
 
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/llvm/Config/config.h
-	/usr/include/llvm/Config/llvm-config.h
-	/usr/include/clang/Config/config.h
-)
+src_install() {
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/config.h
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	use clang && MULTILIB_WRAPPED_HEADERS+=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+}
 
 multilib_src_install() {
 	local mymakeopts=(
@@ -272,7 +279,7 @@ multilib_src_install() {
 		# and clang install-libs doesn't install headers and stuff
 		# (we build it anyway, so install is not a problem)
 		emake "${mymakeopts[@]}" install-libs
-		emake -C tools/clang "${mymakeopts[@]}" install
+		use clang && emake -C tools/clang "${mymakeopts[@]}" install
 
 		# Preserve ABI-variant of llvm-config,
 		# then drop all the executables since LLVM doesn't like to