diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 21 |
2 files changed, 18 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8998664dbeed..2f6a26ae3a72 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1051 2013/11/09 07:49:50 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1052 2013/11/09 10:05:12 dirtyepic Exp $ + + 09 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + Revert previous and instead include the build log and some other info. Don't + pollute the build dir. 09 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: Rename config.log tarball in the hope that people will stop attaching it to diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 270bb97cb480..3f7955bdcce5 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.604 2013/11/09 07:49:50 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.605 2013/11/09 10:05:12 dirtyepic Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1284,13 +1284,18 @@ gcc_do_configure() { has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice" toolchain_death_notice() { - pushd "${WORKDIR}"/build >/dev/null - tar jcf gcc-config-logs.tar.bz2 $(find -name config.log) - eerror - eerror "Please include ${PWD}/gcc-config-logs.tar.bz2" - eerror "in your bug report if the error occurred during configure." - eerror - popd >/dev/null + 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 jcf "${WORKDIR}"/gcc-build-logs.tar.bz2 \ + gccinfo.log build.log $(find -name config.log) + rm gccinfo.log build.log + eerror + eerror "Please include ${WORKDIR}/gcc-build-logs.tar.bz2 in your bug report." + eerror + popd >/dev/null + fi } # This function accepts one optional argument, the make target to be used. |