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 AB42D158094 for ; Sun, 7 Aug 2022 17:53:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE8CCE0A8D; Sun, 7 Aug 2022 17:53:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BC421E0A8D for ; Sun, 7 Aug 2022 17:53:37 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7577340F2B for ; Sun, 7 Aug 2022 17:53:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38B9E543 for ; Sun, 7 Aug 2022 17:53:35 +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: <1659894809.da1b2fc8251c571f43813ecf04522aba75333df2.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: da1b2fc8251c571f43813ecf04522aba75333df2 X-VCS-Branch: master Date: Sun, 7 Aug 2022 17:53:35 +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: c82b80ed-aded-4364-8393-525b6390e23a X-Archives-Hash: 85a1c116b4ce0b618021d250083c4b70 commit: da1b2fc8251c571f43813ecf04522aba75333df2 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 7 17:52:47 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 7 17:53:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1b2fc8 sys-libs/compiler-rt: Sync 15+ to 14.0.6-r1 Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild | 15 +++++++++++---- sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild index 8af221eaa8ad..9330ad9834cf 100644 --- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild @@ -70,7 +70,6 @@ src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build - local nolib_flags=( -nodefaultlibs -nostartfiles -lc ) if use clang; then # Only do this conditionally to allow overriding with # e.g. CC=clang-13 in case of breakage @@ -78,13 +77,21 @@ src_configure() { local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ fi + strip-unsupported-flags - # ensure we can use clang before installing compiler-rt - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - elif ! test_compiler; then + fi + + if ! test_compiler; then + local nolib_flags=( -nodefaultlibs -lc ) + if test_compiler "${nolib_flags[@]}"; then local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" + elif test_compiler "${nolib_flags[@]}" -nostartfiles; then + # Avoiding -nostartfiles earlier on for bug #862540 + nolib_flags+=( -nostartfiles ) + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" fi fi diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild index 8af221eaa8ad..9330ad9834cf 100644 --- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild @@ -70,7 +70,6 @@ src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build - local nolib_flags=( -nodefaultlibs -nostartfiles -lc ) if use clang; then # Only do this conditionally to allow overriding with # e.g. CC=clang-13 in case of breakage @@ -78,13 +77,21 @@ src_configure() { local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ fi + strip-unsupported-flags - # ensure we can use clang before installing compiler-rt - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - elif ! test_compiler; then + fi + + if ! test_compiler; then + local nolib_flags=( -nodefaultlibs -lc ) + if test_compiler "${nolib_flags[@]}"; then local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" + elif test_compiler "${nolib_flags[@]}" -nostartfiles; then + # Avoiding -nostartfiles earlier on for bug #862540 + nolib_flags+=( -nostartfiles ) + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" fi fi