vapier      15/03/17 00:06:40

  Modified:             src_configure.eblit
  Log:
  Use new tc-ld-disable-gold helper.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
D2E96200)

Revision  Changes    Path
1.6                  sys-libs/glibc/files/eblits/src_configure.eblit

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.5&r2=1.6

Index: src_configure.eblit
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src_configure.eblit 9 Feb 2015 16:14:04 -0000       1.5
+++ src_configure.eblit 17 Mar 2015 00:06:40 -0000      1.6
@@ -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 @@
        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=()




Reply via email to