From a00dd8003961520df1f52cf9fa5f069fc62d8607 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 15 Mar 2018 21:58:49 +0100 Subject: [PATCH] sys-libs/libcxx: Fix calling lit with llvm-6+ --- sys-libs/libcxx/libcxx-4.0.1.ebuild | 10 +++++++++- sys-libs/libcxx/libcxx-5.0.1.ebuild | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild index 8b6e05f5ff3d..64f610ce5bb2 100644 --- a/sys-libs/libcxx/libcxx-4.0.1.ebuild +++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild @@ -127,8 +127,16 @@ multilib_src_configure() { # this can be any directory, it just needs to exist... # FIXME: remove this once https://reviews.llvm.org/D25093 is merged -DLLVM_MAIN_SRC_DIR="${T}" - -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/libcxx/libcxx-5.0.1.ebuild b/sys-libs/libcxx/libcxx-5.0.1.ebuild index ff69acef1792..885f8b131826 100644 --- a/sys-libs/libcxx/libcxx-5.0.1.ebuild +++ b/sys-libs/libcxx/libcxx-5.0.1.ebuild @@ -127,8 +127,16 @@ multilib_src_configure() { # this can be any directory, it just needs to exist... # FIXME: remove this once https://reviews.llvm.org/D25093 is merged -DLLVM_MAIN_SRC_DIR="${T}" - -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