From cc592970b5989e3439ab52898372b104a2bb8343 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 15 Mar 2018 21:44:01 +0100 Subject: [PATCH] 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 0610e3424371..23c9c3a7137d 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 b273a72c3cc1..9af30980d38c 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 } -- 2.26.2