From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 15 Mar 2018 20:44:01 +0000 (+0100)
Subject: sys-libs/libcxxabi: Fix calling lit with llvm-6+ installed
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cc592970b5989e3439ab52898372b104a2bb8343;p=gentoo.git

sys-libs/libcxxabi: Fix calling lit with llvm-6+ installed
---

diff --git a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
index 0610e3424371..23c9c3a7137d 100644
--- a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
@@ -72,9 +72,15 @@ multilib_src_configure() {
 		-DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
 	)
 	if use test; then
-		mycmakeargs+=(
-			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-		)
+		if has_version '>=sys-devel/llvm-6'; then
+			mycmakeargs+=(
+				-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			)
+		else
+			mycmakeargs+=(
+				-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+			)
+		fi
 	fi
 	cmake-utils_src_configure
 }
diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
index b273a72c3cc1..9af30980d38c 100644
--- a/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
@@ -76,9 +76,15 @@ multilib_src_configure() {
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
 	)
 	if use test; then
-		mycmakeargs+=(
-			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-		)
+		if has_version '>=sys-devel/llvm-6'; then
+			mycmakeargs+=(
+				-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			)
+		else
+			mycmakeargs+=(
+				-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+			)
+		fi
 	fi
 	cmake-utils_src_configure
 }