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 EB411138331 for ; Thu, 15 Mar 2018 21:12:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC171E094E; 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 C7C2EE094E for ; Thu, 15 Mar 2018 21:12:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6A2B4335C7A 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 9EDA925A 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.a00dd8003961520df1f52cf9fa5f069fc62d8607.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxx/libcxx-4.0.1.ebuild sys-libs/libcxx/libcxx-5.0.1.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a00dd8003961520df1f52cf9fa5f069fc62d8607 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: 6b9dadd5-41ac-4da7-9ec4-4eb30d323fc4 X-Archives-Hash: b12387d22bbc80c3bebb90c6a9968a68 commit: a00dd8003961520df1f52cf9fa5f069fc62d8607 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 15 20:58:49 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=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 }