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

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

diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild
index 8b6e05f5ff3d..64f610ce5bb2 100644
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild
@@ -127,8 +127,16 @@ multilib_src_configure() {
 			# this can be any directory, it just needs to exist...
 			# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
 			-DLLVM_MAIN_SRC_DIR="${T}"
-			-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/libcxx/libcxx-5.0.1.ebuild b/sys-libs/libcxx/libcxx-5.0.1.ebuild
index ff69acef1792..885f8b131826 100644
--- a/sys-libs/libcxx/libcxx-5.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.1.ebuild
@@ -127,8 +127,16 @@ multilib_src_configure() {
 			# this can be any directory, it just needs to exist...
 			# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
 			-DLLVM_MAIN_SRC_DIR="${T}"
-			-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
 }