[gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/

[Michał Górny]

commit:     807880d444fb48efe1f91503b9de511cd868efe0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  3 17:39:06 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 19:39:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807880d4

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

 sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 b4861d13427..76c9139801b 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++"
                )