commit:     ae18c5b4149e30064751e7cea79cc830076b0292
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 19:37:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 19:37:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae18c5b4

toolchain.eclass: fix toolchain_death_notice more

* Go back to -arf. As Marcus points out, it doesn't make sense to append
  there.

* Compress afterwards given we want to handle both directories.

Bug: https://bugs.gentoo.org/948045
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 86302f3bcb4a..ad4703fc550e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -3159,7 +3159,7 @@ toolchain_death_notice() {
                        pushd "${WORKDIR}" >/dev/null
                        (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 
2>&1) > "${dir}"/gccinfo.log
                        [[ -e "${T}"/build.log ]] && cp "${T}"/build.log 
"${dir}"
-                       tar -carf "${WORKDIR}"/gcc-build-logs.tar.xz \
+                       tar -arf "${WORKDIR}"/gcc-build-logs.tar.xz \
                                "${dir#${WORKDIR}/}"/gccinfo.log 
"${dir#${WORKDIR}/}"/build.log $(find -name "${dir#${WORKDIR}/}"/config.log)
                        rm "${dir#${WORKDIR}/}"/gccinfo.log 
"${dir#${WORKDIR}/}"/build.log
                        eerror
@@ -3168,6 +3168,7 @@ toolchain_death_notice() {
                        popd >/dev/null
                fi
        done
+       xz -9e "${WORKDIR}"/gcc-build-logs.tar.xz
 }
 
 fi

Reply via email to