commit: 44dbc63d9c4778fb098cde0b4c99efd6fe7c2759 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Apr 16 02:41:06 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Apr 16 02:41:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44dbc63d
toolchain.eclass: fix libgdiagnostics path without USE=-jit We would configure but not build & install with USE="libgdiagnostics -jit". This doesn't fix bug #953823 yet though. Bug: https://bugs.gentoo.org/953823 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/toolchain.eclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d96c4acabbe2..ebb63901fba5 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2352,7 +2352,7 @@ gcc_do_make() { ) fi - if is_jit ; then + if is_jit || _tc_use_if_iuse libgdiagnostics ; then # TODO: docs for jit? einfo "Building JIT" emake -C "${WORKDIR}"/build-jit "${emakeargs[@]}" @@ -2554,7 +2554,7 @@ toolchain_src_install() { done < <(find gcc/include*/ -name '*.h') fi - if is_jit ; then + if is_jit || _tc_use_if_iuse libgdiagnostics ; then # See https://gcc.gnu.org/onlinedocs/gcc-11.3.0/jit/internals/index.html#packaging-notes # and bug #843341. # @@ -2781,9 +2781,11 @@ gcc_movelibs() { # libgccjit gets installed to /usr/lib, not /usr/$(get_libdir). Probably # due to a bug in gcc build system. - if [[ ${PWD} == "${WORKDIR}"/build-jit ]] && is_jit ; then - dodir "${LIBPATH#${EPREFIX}}" - mv "${ED}"/usr/lib/libgccjit* "${D}${LIBPATH}" || die + if [[ ${PWD} == "${WORKDIR}"/build-jit ]] ; then + if is_jit || _tc_use_if_iuse libgdiagnostics ; then + dodir "${LIBPATH#${EPREFIX}}" + mv "${ED}"/usr/lib/libgccjit* "${D}${LIBPATH}" || die + fi fi # For all the libs that are built for CTARGET, move them into the
