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

[Michał Górny]

commit:     cc592970b5989e3439ab52898372b104a2bb8343
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 20:44:01 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 21:12:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc592970

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

 sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild | 12 +++++++++---
 sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild 
b/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
index 0610e342437..23c9c3a7137 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 b273a72c3cc..9af30980d38 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
 }