commit: b85da6096998aefba65d432607c12748efccc907 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 18 02:45:05 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 18 02:45:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85da609
toolchain.eclass: handle nvptx multilib changes in 15 GCC trunk recently changed its default multilib for nvptx. Make the `mv` there nonfatal with some comments added. We may want to enable all multilibs in future. Bug: https://bugs.gentoo.org/945296 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 8659a78be17e..602f99437145 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2805,8 +2805,10 @@ gcc_movelibs() { mv "${ED}"/usr/nvptx-none/lib/mgomp/mptx-3.1/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/mgomp/mptx-3.1/ mv "${ED}"/usr/lib/gcc/nvptx-none/${GCCMAJOR}/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/ || die mv "${ED}"/usr/lib/gcc/nvptx-none/${GCCMAJOR}/mgomp/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/mgomp/ || die - mv "${ED}"/usr/lib/gcc/nvptx-none/${GCCMAJOR}/mptx-3.1/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/mptx-3.1/ || die - mv "${ED}"/usr/lib/gcc/nvptx-none/${GCCMAJOR}/mgomp/mptx-3.1/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/mgomp/mptx-3.1/ || die + # Nonfatal because the multilib variants change: see r15-5975-g86b3a7532d56f7 and r15-6029-gd4e1f7cfdb8375 + # TODO: Should we enable all of them unconditionally? Expose it somehow (USE_EXPAND?)? + mv "${ED}"/usr/lib/gcc/nvptx-none/${GCCMAJOR}/mptx-3.1/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/mptx-3.1/ + mv "${ED}"/usr/lib/gcc/nvptx-none/${GCCMAJOR}/mgomp/mptx-3.1/*.{a,spec} "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/accel/nvptx-none/mgomp/mptx-3.1/ fi # We remove directories separately to avoid this case:
