From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 3 Apr 2018 17:39:06 +0000 (+0200)
Subject: sys-libs/compiler-rt: Fix calling lit with llvm-6+ macros
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=807880d444fb48efe1f91503b9de511cd868efe0;p=gentoo.git

sys-libs/compiler-rt: Fix calling lit with llvm-6+ macros
---

diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
index b4861d13427b..76c9139801b1 100644
--- a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
@@ -85,9 +85,17 @@ src_configure() {
 	fi
 
 	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
 
+		mycmakeargs+=(
 			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
 			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
 		)