diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-09-10 07:41:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-09-10 07:41:06 +0000 |
| commit | 73a71a67d1c564eddc7dda5c2e18f8082bd22039 (patch) | |
| tree | beed953e7679610d063618ec2094518a1b6c0bb4 /sys-libs | |
| parent | Stable for x86, wrt bug #522448 (diff) | |
| download | gentoo-2-73a71a67d1c564eddc7dda5c2e18f8082bd22039.tar.gz gentoo-2-73a71a67d1c564eddc7dda5c2e18f8082bd22039.tar.bz2 gentoo-2-73a71a67d1c564eddc7dda5c2e18f8082bd22039.zip | |
Move the toolchain dump message to the configure stage.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_compile.eblit | 45 |
2 files changed, 30 insertions, 21 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 1621e574962c..af309018d7ff 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1015 2014/09/10 05:59:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1016 2014/09/10 07:41:06 vapier Exp $ + + 10 Sep 2014; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_compile.eblit: + Move the toolchain dump message to the configure stage. 10 Sep 2014; Mike Frysinger <vapier@gentoo.org> +files/eblits/src_prepare.eblit, files/eblits/src_unpack.eblit: diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit index d606e137ad29..0aff037f4477 100644 --- a/sys-libs/glibc/files/eblits/src_compile.eblit +++ b/sys-libs/glibc/files/eblits/src_compile.eblit @@ -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 @@ glibc_do_configure() { } 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" |