From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1662606-garchives=archives.gentoo.org@lists.gentoo.org> 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 B23EC15852A for <garchives@archives.gentoo.org>; Mon, 19 Aug 2024 06:02:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57492E2A5B; Mon, 19 Aug 2024 06:02:18 +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 3C2BCE2A5B for <gentoo-commits@lists.gentoo.org>; Mon, 19 Aug 2024 06:02:18 +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 BFFCA340C7C for <gentoo-commits@lists.gentoo.org>; Mon, 19 Aug 2024 06:02:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B4D71EEA for <gentoo-commits@lists.gentoo.org>; Mon, 19 Aug 2024 06:02:15 +0000 (UTC) From: "Viorel Munteanu" <ceamac@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" <ceamac@gentoo.org> Message-ID: <1724047328.b1619cb5f7d2fafae4adeaa9b25182eb6f658c17.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain-funcs.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: b1619cb5f7d2fafae4adeaa9b25182eb6f658c17 X-VCS-Branch: master Date: Mon, 19 Aug 2024 06:02:15 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9627f482-9b15-4bf3-adf2-f2238a83dea0 X-Archives-Hash: 394d10a64a08c959ab3cf24ac77477f9 commit: b1619cb5f7d2fafae4adeaa9b25182eb6f658c17 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Mon Aug 19 05:53:15 2024 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Mon Aug 19 06:02:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1619cb5 toolchain-funcs.eclass: fix detecting ld.bfd There is some more output from the compiler here. We must use a regular expression to avoid a false positive from mold. Acked-by: Sam James <sam <AT> gentoo.org> Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> eclass/toolchain-funcs.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index bc1fb064fc45..5e36fa275dcd 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -472,7 +472,7 @@ tc-ld-is-bfd() { EOF out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1) rm -f "${base}"* - if [[ ${out} != "GNU ld"* ]] ; then + if [[ ! ${out} =~ .*^"GNU ld".* ]] ; then return 1 fi