From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 15 Jan 2017 14:13:52 +0000 (+0100)
Subject: sys-libs/libcxxabi: Remove unnecessary LLVM_LIBDIR_SUFFIX
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d6364296c2d36c0cbf9235a452c6968913a795e2;p=gentoo.git

sys-libs/libcxxabi: Remove unnecessary LLVM_LIBDIR_SUFFIX
---

diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
index 9a6cf0ebcfef..5840b0166170 100644
--- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
@@ -29,8 +29,9 @@ RDEPEND="
 			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
 		)
 	)"
+# LLVM 4 required for llvm-config --cmakedir
 DEPEND="${RDEPEND}
-	>=sys-devel/llvm-3.9.0
+	>=sys-devel/llvm-4
 	test? ( >=sys-devel/clang-3.9.0
 		~sys-libs/libcxx-${PV}[libcxxabi(-)]
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
@@ -57,15 +58,9 @@ src_unpack() {
 	git-r3_checkout
 }
 
-src_configure() {
-	NATIVE_LIBDIR=$(get_libdir)
-	cmake-multilib_src_configure
-}
-
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
 		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
 		-DLIBCXXABI_ENABLE_SHARED=ON
 		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)