commit: a00dd8003961520df1f52cf9fa5f069fc62d8607 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Mar 15 20:58:49 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=a00dd800
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 8b6e05f5ff3..64f610ce5bb 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 ff69acef179..885f8b13182 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 }