summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-10-07 03:18:51 +0000
committerMike Frysinger <vapier@gentoo.org>2007-10-07 03:18:51 +0000
commit27a875fe7a74a0cfeb00e519dce676caad836589 (patch)
treef5e3255a9007dfa68501a7e824a9bd2a1695f89e /sys-libs
parentAdd needed quotes; don't specify the default for DESTTREE; add die messages. (diff)
downloadgentoo-2-27a875fe7a74a0cfeb00e519dce676caad836589.tar.gz
gentoo-2-27a875fe7a74a0cfeb00e519dce676caad836589.tar.bz2
gentoo-2-27a875fe7a74a0cfeb00e519dce676caad836589.zip
tweak the fix for #185404 a bit
(Portage version: 2.1.3.11)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/files/eblits/common.eblit9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 5b254113fe55..8356095376e6 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.2 2007/08/06 09:50:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.3 2007/10/07 03:18:51 vapier Exp $
# We need to be able to set alternative headers for
# compiling for non-native platform
@@ -71,8 +71,11 @@ setup_flags() {
case $(tc-arch) in
x86)
# -march needed for #185404
- local t=${CTARGET_OPT:-${CTARGET}}
- export CFLAGS="-march=${t%%-*} ${CFLAGS}"
+ if ! echo "" | $(tc-getCC) -E -dD - | grep -qs __i686__ ; then
+ filter-flags '-march=*'
+ local t=${CTARGET_OPT:-${CTARGET}}
+ export CFLAGS="-march=${t%%-*} ${CFLAGS}"
+ fi
;;
amd64)
# Punt this when amd64's 2004.3 is removed