diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-18 20:24:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-18 20:24:03 +0000 |
| commit | 6a2818e154ad8fbf163fe47d7c2543ff0f3fac05 (patch) | |
| tree | 019da1a9dc160db2d71db3e8bf5885fa5b80f6b6 /sys-libs | |
| parent | arm stable, bug #357497 (diff) | |
| download | historical-6a2818e154ad8fbf163fe47d7c2543ff0f3fac05.tar.gz historical-6a2818e154ad8fbf163fe47d7c2543ff0f3fac05.tar.bz2 historical-6a2818e154ad8fbf163fe47d7c2543ff0f3fac05.zip | |
Stick the ABI flags into CC so that they are used at all steps -- compiler, assemble, and link.
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 263c6b23276b..b7548bb3756a 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.759 2011/03/11 07:43:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.760 2011/03/18 20:24:03 vapier Exp $ + + 18 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit: + Stick the ABI flags into CC so that they are used at all steps -- compiler, + assemble, and link. *glibc-2.13-r2 (11 Mar 2011) diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index 25ae8d88f279..691dee9ce0b6 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.16 2011/03/10 08:04:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.17 2011/03/18 20:24:03 vapier Exp $ # We need to be able to set alternative headers for # compiling for non-native platform @@ -288,9 +288,12 @@ setup_env() { export ABI=${ABI:-${DEFAULT_ABI:-default}} local VAR=CFLAGS_${ABI} - # We need to export CFLAGS with abi information in them because - # glibc's configure script checks CFLAGS for some targets (like mips) - export CFLAGS="${!VAR} ${CFLAGS}" + # We need to export CFLAGS with abi information in them because glibc's + # configure script checks CFLAGS for some targets (like mips). Keep + # around the original clean value to avoid appending multiple ABIs on + # top of each other. + : ${__GLIBC_CC:=$(tc-getCC)} + export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}" } just_headers() { |