vapier 14/09/10 07:41:06 Modified: src_compile.eblit Log: Move the toolchain dump message to the configure stage. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.42 sys-libs/glibc/files/eblits/src_compile.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.42&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.42&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.41&r2=1.42 Index: src_compile.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- src_compile.eblit 10 Sep 2014 05:49:03 -0000 1.41 +++ src_compile.eblit 10 Sep 2014 07:41:06 -0000 1.42 @@ -1,11 +1,33 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.41 2014/09/10 05:49:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.42 2014/09/10 07:41:06 vapier Exp $ + +dump_toolchain_settings() { + echo + + einfo "$*" + + local v + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC {AS,C,CPP,CXX,LD}FLAGS ; do + einfo " $(printf '%15s' ${v}:) ${!v}" + done + + export CC=$(tc-getCC ${CTARGET}) + # Glibc does not work with gold (for various reasons) #269274. + if $(tc-getLD ${CTARGET}) --version | grep -q 'GNU gold' ; then + local d="${T}/bfd-linker" + mkdir -p "${d}" + ln -sf $(which ${CTARGET}-ld.bfd) "${d}"/ld + CC+=" -B${d}" + fi + einfo " $(printf '%15s' 'Manual CC:') ${CC}" + echo +} glibc_do_configure() { - local myconf=() + dump_toolchain_settings "Configuring glibc for $1" - einfo "Configuring GLIBC for $1" + local myconf=() # set addons pushd "${S}" > /dev/null @@ -140,23 +162,6 @@ } toolchain-glibc_src_compile() { - echo - local v - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC {AS,C,CPP,CXX,LD}FLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - - export CC=$(tc-getCC ${CTARGET}) - # Glibc does not work with gold (for various reasons) #269274. - if $(tc-getLD ${CTARGET}) --version | grep -q 'GNU gold' ; then - local d="${T}/bfd-linker" - mkdir -p "${d}" - ln -sf $(which ${CTARGET}-ld.bfd) "${d}"/ld - CC+=" -B${d}" - fi - einfo " $(printf '%15s' 'Manual CC:') ${CC}" - echo - if want_linuxthreads ; then glibc_do_configure linuxthreads emake || die "make for ${ABI} failed"
