From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B97CD1382C5 for ; Thu, 15 Mar 2018 21:12:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A78ADE0942; Thu, 15 Mar 2018 21:12:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7CEAFE0942 for ; Thu, 15 Mar 2018 21:12:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 003A4335C36 for ; Thu, 15 Mar 2018 21:12:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AE12259 for ; Thu, 15 Mar 2018 21:12:48 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1521148363.cc592970b5989e3439ab52898372b104a2bb8343.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxxabi/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild X-VCS-Directories: sys-libs/libcxxabi/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: cc592970b5989e3439ab52898372b104a2bb8343 X-VCS-Branch: master Date: Thu, 15 Mar 2018 21:12:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0af70065-acda-4702-a44f-aa01354b80fc X-Archives-Hash: 4c0e83c446943929df7670198f521532 commit: cc592970b5989e3439ab52898372b104a2bb8343 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 15 20:44:01 2018 +0000 Commit: Michał Górny gentoo 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 }