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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B8E8158086 for ; Wed, 29 Dec 2021 23:40:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A77152BC02A; Wed, 29 Dec 2021 23:40:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B4D02BC02A for ; Wed, 29 Dec 2021 23:40:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B46D335CA3 for ; Wed, 29 Dec 2021 23:40:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 471801BF for ; Wed, 29 Dec 2021 23:39:59 +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: <1640821149.b052863fec72b9eb6bca023bc36d289bfaa78f4c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/llvm-libunwind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/llvm-libunwind/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b052863fec72b9eb6bca023bc36d289bfaa78f4c X-VCS-Branch: master Date: Wed, 29 Dec 2021 23:39:59 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 189d16d4-4fc9-417d-a5e7-4200e7fd361c X-Archives-Hash: 94a07a868a29a6168b57b8e43c37d2e0 commit: b052863fec72b9eb6bca023bc36d289bfaa78f4c Author: Michał Górny gentoo org> AuthorDate: Wed Dec 29 23:39:09 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 29 23:39:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b052863f sys-libs/llvm-libunwind: Fix forcing test compiler in 14.x Signed-off-by: Michał Górny gentoo.org> sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild index c4a1e07a077f..a9e274cc99af 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild @@ -67,17 +67,23 @@ multilib_src_configure() { -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt} ) if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi cmake_src_configure + + if use test; then + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + + # meh, we need to override the compiler explicitly + sed -e "/%{cxx}/s@, '.*'@, '${clang_path}'@" \ + -i "${BUILD_DIR}"/test/lit.site.cfg || die + fi } wrap_libcxxabi() {