From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 9 Jan 2019 20:26:16 +0000 (+0100)
Subject: sys-devel/clang: z3 is now multilib
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9cd5f34edd419e2aa528e351b2ded5f3f3807b0a;p=gentoo.git

sys-devel/clang: z3 is now multilib

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 98b025974053..bf5ab043a347 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
 	static-analyzer? (
 		dev-lang/perl:*
-		z3? ( >=sci-mathematics/z3-4.7.1:0= )
+		z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
 	)
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	${PYTHON_DEPS}"
@@ -137,7 +137,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 		# z3 is not multilib-friendly
-		-DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(multilib_native_usex z3)
+		-DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3)
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"