From 37185a5f2fd3d3e821d63ca90dffe9629d147da1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Mar 2025 00:28:41 +0000 Subject: gentoo auto-resync : 14:03:2025 - 00:28:41 --- eclass/toolchain.eclass | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'eclass/toolchain.eclass') diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index e365269d1c18..d48d8cf78d06 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2646,6 +2646,13 @@ toolchain_src_install() { fi fi + # Hack for C++ modules + if ! is_crosscompile; then + # PR19266 (bug #948394) + sed -i -e "s,\.\./lib/gcc/${CHOST}/${GCCMAJOR}/include/,include/," \ + "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/libstdc++.modules.json || die + fi + # As gcc installs object files built against both ${CHOST} and ${CTARGET} # ideally we will need to strip them using different tools: # Using ${CHOST} tools: -- cgit v1.2.3