From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 37DBB1584F2 for ; Fri, 14 Mar 2025 02:50:35 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1E0153430DA for ; Fri, 14 Mar 2025 02:50:35 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1D4ED1103C7; Fri, 14 Mar 2025 02:50:34 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 163591103C7 for ; Fri, 14 Mar 2025 02:50:34 +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 BB16B3430DA for ; Fri, 14 Mar 2025 02:50:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1580310F1 for ; Fri, 14 Mar 2025 02:50:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1741920591.9c4f5b81368474b9bb7fb8245945c7faba3cc3e5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9c4f5b81368474b9bb7fb8245945c7faba3cc3e5 X-VCS-Branch: master Date: Fri, 14 Mar 2025 02:50:32 +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: 92f06ee7-5e2a-4b4c-bf57-09e46132714b X-Archives-Hash: fd5f5b01e4c55d80b563bb957be8d51e commit: 9c4f5b81368474b9bb7fb8245945c7faba3cc3e5 Author: Sam James gentoo org> AuthorDate: Fri Mar 14 02:48:57 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 14 02:49:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4f5b81 toolchain.eclass: only sed .json for 15 ... it doesn't exist in older versions. Bug: https://bugs.gentoo.org/948394 Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d48d8cf78d06..bb8bb6512394 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2647,7 +2647,7 @@ toolchain_src_install() { fi # Hack for C++ modules - if ! is_crosscompile; then + if ! is_crosscompile && tc_version_is_at_least 15.0.1_pre20250316 ${PV}; then # PR19266 (bug #948394) sed -i -e "s,\.\./lib/gcc/${CHOST}/${GCCMAJOR}/include/,include/," \ "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/libstdc++.modules.json || die