From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 10 Feb 2017 22:40:32 +0000 (+0100)
Subject: sys-devel/clang: Fix building extra tools in -9999
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3fdc38aad2e13ba8820aceea9b25b58428f93437;p=gentoo.git

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

diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index f004373e4f34..3cad65beaf03 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() {