diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-12-25 20:08:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-12-25 20:08:40 +0000 |
| commit | 68b08c7daf76eda42051a0ed1985e24eb81d6e7e (patch) | |
| tree | c98caeeeadcdaa3af19e5474178ec42c847141d5 /sys-libs/glibc | |
| parent | Version bump 1.8 branch (diff) | |
| download | gentoo-2-68b08c7daf76eda42051a0ed1985e24eb81d6e7e.tar.gz gentoo-2-68b08c7daf76eda42051a0ed1985e24eb81d6e7e.tar.bz2 gentoo-2-68b08c7daf76eda42051a0ed1985e24eb81d6e7e.zip | |
Force usage of bfd linker if active linker is gold #269274 by Chris Smith.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_compile.eblit | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index ffde97a01131..8d23aca0cd0d 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,5 +1,9 @@ # ChangeLog for sys-libs/glibc -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.908 2012/11/18 09:32:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.909 2012/12/25 20:08:40 vapier Exp $ + + 25 Dec 2012; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_compile.eblit: + Force usage of bfd linker if active linker is gold #269274 by Chris Smith. 18 Nov 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.16.0.ebuild: Fix arm cross-compile errors with _Unwind_Resume. diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit index 355daeb9cf4e..8f89edca9c41 100644 --- a/sys-libs/glibc/files/eblits/src_compile.eblit +++ b/sys-libs/glibc/files/eblits/src_compile.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.29 2012/11/18 08:06:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.30 2012/12/25 20:08:39 vapier Exp $ glibc_do_configure() { local myconf @@ -117,7 +117,15 @@ toolchain-glibc_src_compile() { 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 |