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 DF755158094 for ; Mon, 10 Oct 2022 20:52:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1873E0919; Mon, 10 Oct 2022 20:52:47 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D180BE0919 for ; Mon, 10 Oct 2022 20:52:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00BD234103B for ; Mon, 10 Oct 2022 20:52:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03453613 for ; Mon, 10 Oct 2022 20:52:44 +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: <1665435159.2faa09dc23a1bbb9b385afe8bea639da4a18bc73.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-13.0.1.ebuild sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild sys-libs/libcxxabi/libcxxabi-15.0.2.ebuild sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221010.ebuild X-VCS-Directories: sys-libs/libcxxabi/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2faa09dc23a1bbb9b385afe8bea639da4a18bc73 X-VCS-Branch: master Date: Mon, 10 Oct 2022 20:52:44 +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: 06bebfef-aaf1-4b11-a34a-1bdfa5af9815 X-Archives-Hash: 6af0bae03a9ab46bbbaf90762c6f4e13 commit: 2faa09dc23a1bbb9b385afe8bea639da4a18bc73 Author: Michał Górny gentoo org> AuthorDate: Mon Oct 10 20:43:51 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Oct 10 20:52:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2faa09dc sys-libs/libcxxabi: Use tc-get-c-rtlib Signed-off-by: Michał Górny gentoo.org> sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild | 8 ++------ sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild | 8 ++------ sys-libs/libcxxabi/libcxxabi-15.0.2.ebuild | 14 ++++---------- sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild | 14 ++++---------- sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild | 14 ++++---------- sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild | 14 ++++---------- sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221010.ebuild | 14 ++++---------- 7 files changed, 24 insertions(+), 62 deletions(-) diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild index b49532e94b6d..b2fcf26fc7f0 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild @@ -53,12 +53,8 @@ multilib_src_configure() { # link against compiler-rt instead of libgcc if we are using clang with libunwind local want_compiler_rt=OFF - if use libunwind && tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi + if use libunwind && [[ $(tc-get-c-rtlib) == compiler-rt ]]; then + want_compiler_rt=ON fi local libdir=$(get_libdir) diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild index 1aa08e4c22f1..f88c43716406 100644 --- a/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild @@ -59,12 +59,8 @@ pkg_setup() { multilib_src_configure() { # link against compiler-rt instead of libgcc if we are using clang with libunwind local want_compiler_rt=OFF - if use libunwind && tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi + if use libunwind && [[ $(tc-get-c-rtlib) == compiler-rt ]]; then + want_compiler_rt=ON fi local libdir=$(get_libdir) diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.2.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.2.ebuild index 5665bc0cb12f..d9a53ffa7084 100644 --- a/sys-libs/libcxxabi/libcxxabi-15.0.2.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-15.0.2.ebuild @@ -63,15 +63,9 @@ multilib_src_configure() { strip-unsupported-flags fi - # link against compiler-rt instead of libgcc if this is what clang does - local want_compiler_rt=OFF - if tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi - fi + # link to compiler-rt + local use_compiler_rt=OFF + [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON local libdir=$(get_libdir) local mycmakeargs=( @@ -83,7 +77,7 @@ multilib_src_configure() { -DLIBCXXABI_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} + -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt} # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild index 130101c20cb9..8d8f8212d31e 100644 --- a/sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild @@ -62,15 +62,9 @@ multilib_src_configure() { strip-unsupported-flags fi - # link against compiler-rt instead of libgcc if this is what clang does - local want_compiler_rt=OFF - if tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi - fi + # link to compiler-rt + local use_compiler_rt=OFF + [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON local libdir=$(get_libdir) local mycmakeargs=( @@ -82,7 +76,7 @@ multilib_src_configure() { -DLIBCXXABI_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} + -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt} # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild index 130101c20cb9..8d8f8212d31e 100644 --- a/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild @@ -62,15 +62,9 @@ multilib_src_configure() { strip-unsupported-flags fi - # link against compiler-rt instead of libgcc if this is what clang does - local want_compiler_rt=OFF - if tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi - fi + # link to compiler-rt + local use_compiler_rt=OFF + [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON local libdir=$(get_libdir) local mycmakeargs=( @@ -82,7 +76,7 @@ multilib_src_configure() { -DLIBCXXABI_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} + -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt} # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild index 130101c20cb9..8d8f8212d31e 100644 --- a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild @@ -62,15 +62,9 @@ multilib_src_configure() { strip-unsupported-flags fi - # link against compiler-rt instead of libgcc if this is what clang does - local want_compiler_rt=OFF - if tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi - fi + # link to compiler-rt + local use_compiler_rt=OFF + [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON local libdir=$(get_libdir) local mycmakeargs=( @@ -82,7 +76,7 @@ multilib_src_configure() { -DLIBCXXABI_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} + -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt} # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221010.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221010.ebuild index 130101c20cb9..8d8f8212d31e 100644 --- a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221010.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221010.ebuild @@ -62,15 +62,9 @@ multilib_src_configure() { strip-unsupported-flags fi - # link against compiler-rt instead of libgcc if this is what clang does - local want_compiler_rt=OFF - if tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi - fi + # link to compiler-rt + local use_compiler_rt=OFF + [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON local libdir=$(get_libdir) local mycmakeargs=( @@ -82,7 +76,7 @@ multilib_src_configure() { -DLIBCXXABI_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} + -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt} # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h