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 0610e34243718360060031276eb19781643c9a41..23c9c3a7137dafb7d473632568c653cca6e7ba50 100644 (file)
--- 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 b273a72c3cc1da84cb1ff2b38d90d74814977503..9af30980d38c12fc77aa7e68f715b8d2e4b2ed60 100644 (file)
--- 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
 }