diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-03-17 00:06:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-17 00:06:40 +0000 |
| commit | 49796e55648b752864c563ab1af2d73425097431 (patch) | |
| tree | 9e478c9b23c7cf4a43ecd11e79decbd30e153b14 | |
| parent | Version bump. Import live git ebuild from overlay. (diff) | |
| download | gentoo-2-49796e55648b752864c563ab1af2d73425097431.tar.gz gentoo-2-49796e55648b752864c563ab1af2d73425097431.tar.bz2 gentoo-2-49796e55648b752864c563ab1af2d73425097431.zip | |
Use new tc-ld-disable-gold helper.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_configure.eblit | 17 |
2 files changed, 12 insertions, 11 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index f54b004cdc37..9011997707d3 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1041 2015/03/14 08:19:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1042 2015/03/17 00:06:40 vapier Exp $ + + 17 Mar 2015; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_configure.eblit: + Use new tc-ld-disable-gold helper. 14 Mar 2015; Mike Frysinger <vapier@gentoo.org> -files/2.10/glibc-2.10-hardened-ssp-compat.patch, diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit index 7c220b79865a..1aa001c57f6c 100644 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ b/sys-libs/glibc/files/eblits/src_configure.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.5 2015/02/09 16:14:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.6 2015/03/17 00:06:40 vapier Exp $ dump_toolchain_settings() { echo @@ -8,23 +8,20 @@ dump_toolchain_settings() { einfo "$*" local v - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC {AS,C,CPP,CXX,LD}FLAGS ; do + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC LD {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 + # The glibc configure script doesn't properly use LDFLAGS all the time. + export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}" einfo " $(printf '%15s' 'Manual CC:') ${CC}" echo } glibc_do_configure() { + # Glibc does not work with gold (for various reasons) #269274. + tc-ld-disable-gold + dump_toolchain_settings "Configuring glibc for $1" local myconf=() |