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 F1551158086 for ; Wed, 1 Dec 2021 16:47:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1585E07D4; Wed, 1 Dec 2021 16:47:31 +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 A1380E07D4 for ; Wed, 1 Dec 2021 16:47:31 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DBA4342FAB for ; Wed, 1 Dec 2021 16:47:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B7541FE for ; Wed, 1 Dec 2021 16:47:29 +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: <1638377245.ddc2e725ec82a7e16518fa6a4d22b777d058aa28.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-13.0.0.ebuild sys-libs/libcxx/libcxx-13.0.1.9999.ebuild sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild sys-libs/libcxx/libcxx-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ddc2e725ec82a7e16518fa6a4d22b777d058aa28 X-VCS-Branch: master Date: Wed, 1 Dec 2021 16:47:29 +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: 03fb89d2-ab1e-4035-8bc1-7266a17792fd X-Archives-Hash: f7f8a07ad010d88e24855eaa1981dd4f commit: ddc2e725ec82a7e16518fa6a4d22b777d058aa28 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 1 16:46:55 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 1 16:47:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc2e725 sys-libs/libcxx: Set target triple unconditionally to fix clangrt Set target triple unconditionally in order to fix building against compiler-rt. Signed-off-by: Michał Górny gentoo.org> sys-libs/libcxx/libcxx-13.0.0.ebuild | 2 +- sys-libs/libcxx/libcxx-13.0.1.9999.ebuild | 2 +- sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild | 2 +- sys-libs/libcxx/libcxx-14.0.0.9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/libcxx/libcxx-13.0.0.ebuild b/sys-libs/libcxx/libcxx-13.0.0.ebuild index dc0615878d5b..851870fd9e95 100644 --- a/sys-libs/libcxx/libcxx-13.0.0.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.0.ebuild @@ -132,6 +132,7 @@ multilib_src_configure() { -DLIBCXX_INCLUDE_TESTS=$(usex test) -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} + -DLIBCXX_TARGET_TRIPLE="${CHOST}" -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" ) @@ -144,7 +145,6 @@ multilib_src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure diff --git a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild index fbcd79834cfb..be5566afa3bf 100644 --- a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild @@ -132,6 +132,7 @@ multilib_src_configure() { -DLIBCXX_INCLUDE_TESTS=$(usex test) -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} + -DLIBCXX_TARGET_TRIPLE="${CHOST}" -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" ) @@ -144,7 +145,6 @@ multilib_src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure diff --git a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild index 2759ecac9550..f8fd0e126832 100644 --- a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild @@ -132,6 +132,7 @@ multilib_src_configure() { -DLIBCXX_INCLUDE_TESTS=$(usex test) -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} + -DLIBCXX_TARGET_TRIPLE="${CHOST}" -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" ) @@ -144,7 +145,6 @@ multilib_src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure diff --git a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild index fbcd79834cfb..be5566afa3bf 100644 --- a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild @@ -132,6 +132,7 @@ multilib_src_configure() { -DLIBCXX_INCLUDE_TESTS=$(usex test) -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} + -DLIBCXX_TARGET_TRIPLE="${CHOST}" -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" ) @@ -144,7 +145,6 @@ multilib_src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure