diff options
| author |   Sam James <sam@gentoo.org> | 2024-11-03 09:34:26 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-11-03 09:35:21 +0000 |
| commit | d82f81cd65b9a668bd7940151e3fa876d4b0ce92 (patch) | |
| tree | 64ad4c571a89d44af5bd242a638b44332b51afaa /eclass | |
| parent | dev-tcltk/tcllib: drop test that need network (diff) | |
| download | gentoo-d82f81cd65b9a668bd7940151e3fa876d4b0ce92.tar.gz gentoo-d82f81cd65b9a668bd7940151e3fa876d4b0ce92.tar.bz2 gentoo-d82f81cd65b9a668bd7940151e3fa876d4b0ce92.zip | |
toolchain.eclass: fix death hooks for JIT build
We want to recover logs from that too.
Bug: https://bugs.gentoo.org/942769
Fixes: 5bed0c77a1c54ac9297db4bb54af2e45c0558ec7
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index e464f8c53972..aa7134b23e8e 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2976,18 +2976,21 @@ XGCC() { get_make_var GCC_FOR_TARGET ; } has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice" toolchain_death_notice() { - if [[ -e "${WORKDIR}"/build ]] ; then - pushd "${WORKDIR}"/build >/dev/null - (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log - [[ -e "${T}"/build.log ]] && cp "${T}"/build.log . - tar -acf "${WORKDIR}"/gcc-build-logs.tar.xz \ - gccinfo.log build.log $(find -name config.log) - rm gccinfo.log build.log - eerror - eerror "Please include ${WORKDIR}/gcc-build-logs.tar.xz in your bug report." - eerror - popd >/dev/null - fi + local dir + for dir in "${WORKDIR}"/build-jit "${WORKDIR}"/build ; do + if [[ -e "${dir}" ]] ; then + pushd "${WORKDIR}" >/dev/null + (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log + [[ -e "${T}"/build.log ]] && cp "${T}"/build.log . + tar -arf "${WORKDIR}"/gcc-build-logs.tar.xz \ + "${dir}"/gccinfo.log "${dir}"/build.log $(find -name "${dir}"/config.log) + rm "${dir}"/gccinfo.log "${dir}"/build.log + eerror + eerror "Please include ${WORKDIR}/gcc-build-logs.tar.xz in your bug report." + eerror + popd >/dev/null + fi + done } fi |