[gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/

[Michał Górny]

commit:     3fdc38aad2e13ba8820aceea9b25b58428f93437
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 22:40:32 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 12:07:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdc38aa

sys-devel/clang: Fix building extra tools in -9999

 sys-devel/clang/clang-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-devel/clang/clang-9999.ebuild 
b/sys-devel/clang/clang-9999.ebuild
index f004373e4f..3cad65beaf 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -112,7 +112,7 @@ src_unpack() {
        git-r3_fetch
 
        git-r3_checkout http://llvm.org/git/clang-tools-extra.git \
-               "${S}"/tools/clang/tools/extra
+               "${S}"/tools/extra
        if use test; then
                git-r3_checkout http://llvm.org/git/llvm.git \
                        "${WORKDIR}"/llvm
@@ -179,7 +179,7 @@ multilib_src_configure() {
                )
        else
                mycmakeargs+=(
-                       -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
+                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
                )
        fi
 
@@ -208,6 +208,7 @@ multilib_src_test() {
        # respect TMPDIR!
        local -x LIT_PRESERVES_TMP=1
        cmake-utils_src_make check-clang
+       multilib_is_native_abi && cmake-utils_src_make check-clang-tools
 }
 
 src_install() {