From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0C6041381F3 for ; Sun, 14 Jul 2013 21:18:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E622FE0969; Sun, 14 Jul 2013 21:18:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A915E0969 for ; Sun, 14 Jul 2013 21:18:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C20A33E769 for ; Sun, 14 Jul 2013 21:18:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 17903E468F for ; Sun, 14 Jul 2013 21:18:45 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1373836720.b39a7c6cc27ebe00df71862cff962bab2c00712c.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-devel/llvm/llvm-9999-r1.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b39a7c6cc27ebe00df71862cff962bab2c00712c X-VCS-Branch: master Date: Sun, 14 Jul 2013 21:18:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 16f60a8f-5115-4bd1-8a46-da26dd776e89 X-Archives-Hash: 0458e28e31bc9eac7385a48baa97e71a commit: b39a7c6cc27ebe00df71862cff962bab2c00712c Author: Michał Górny gentoo org> AuthorDate: Sun Jul 14 21:18:40 2013 +0000 Commit: Michał Górny gentoo 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