From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11640158042 for ; Wed, 6 Nov 2024 11:29:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05209E09B1; Wed, 6 Nov 2024 11:27:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0AC6E09B1 for ; Wed, 6 Nov 2024 11:27:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A78A340BEF for ; Wed, 6 Nov 2024 11:27:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 984D2F32 for ; Wed, 6 Nov 2024 11:27:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1730891927.1bf781b83fdfd96e662ec76a54ff5ca0b9aad5f6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1bf781b83fdfd96e662ec76a54ff5ca0b9aad5f6 X-VCS-Branch: master Date: Wed, 6 Nov 2024 11:27:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5620efcb-99b5-43c0-b7b6-4425b91b72ad X-Archives-Hash: f180f62c3b92ea41fd84c6053da904a0 commit: 1bf781b83fdfd96e662ec76a54ff5ca0b9aad5f6 Author: Sam James gentoo org> AuthorDate: Wed Nov 6 11:18:47 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 6 11:18:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf781b8 toolchain.eclass: further death hook fixes Fixes: d82f81cd65b9a668bd7940151e3fa876d4b0ce92 Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index aa7134b23e8e..b25c5dcf0929 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2980,10 +2980,10 @@ toolchain_death_notice() { 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 . + (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > "${dir}"/gccinfo.log + [[ -e "${T}"/build.log ]] && cp "${T}"/build.log "${dir}" tar -arf "${WORKDIR}"/gcc-build-logs.tar.xz \ - "${dir}"/gccinfo.log "${dir}"/build.log $(find -name "${dir}"/config.log) + "${dir#${WORKDIR}/}"/gccinfo.log "${dir#${WORKDIR}/}"/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."