commit: b9c5c7723b11f68319ff9d00a3eeba26c4a22733 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jan 21 23:12:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 21 23:12:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c5c772
toolchain.eclass: use lib*, not get_libdir for cross get_libdir isn't right for ROOT and cross-compilation. Closes: https://bugs.gentoo.org/908455 Bug: https://bugs.gentoo.org/794181 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/toolchain.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a52fd268c8e8..3f7c2fbff780 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2749,7 +2749,9 @@ gcc_movelibs() { # code to run on the target. if is_crosscompile ; then dodir "${HOSTLIBPATH#${EPREFIX}}" - mv "${ED}"/usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die + # XXX: Ideally, we'd use $(get_libdir) here, but it's + # not right for cross. See bug #942573 and bug #794181. + mv "${ED}"/usr/lib*/libcc1* "${D}${HOSTLIBPATH}" || die fi # libgccjit gets installed to /usr/lib, not /usr/$(get_libdir). Probably
