commit: 977b73a1cb736846add244dbd55726ebec0f50f6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 28 23:06:20 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 28 23:06:32 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977b73a1
toolchain.eclass: fix moving accel bits w/ USE=-fortran Just conditionalise the f951 removal instead. Bug: https://bugs.gentoo.org/970714 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/toolchain.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index b77c0b69aab5..2dd2ed59b22d 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2846,9 +2846,11 @@ gcc_movelibs() { # Without this, we end up either unable to find the libgomp spec/archive, or # we underlink and can't find gomp_nvptx_main (presumably because we can't find the plugin) # https://src.fedoraproject.org/rpms/gcc/blob/02c34dfa3627ef05d676d30e152a66e77b58529b/f/gcc.spec#_1445 - if [[ ${CATEGORY} == cross-accel-nvptx* ]] && is_fortran ; then + if [[ ${CATEGORY} == cross-accel-nvptx* ]] ; then rm -rf "${ED}"/usr/libexec/gcc/nvptx-none/${GCCMAJOR}/install-tools - rm -rf "${ED}"/usr/libexec/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/{install-tools,plugin,cc1,cc1plus,f951} + rm -rf "${ED}"/usr/libexec/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/{install-tools,plugin,cc1,cc1plus} + is_fortran && rm -rf "${ED}"/usr/libexec/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/f951 + rm -rf "${ED}"/usr/lib/gcc/nvptx-none/${GCCMAJOR}/{install-tools,plugin} rm -rf "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/{install-tools,plugin,include-fixed} mv "${ED}"/usr/nvptx-none/lib/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/
