diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-01-19 23:36:03 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-01-19 23:36:03 +0000 |
| commit | de02c8b7bf9cae2bc72c4f387ff44637eee341d6 (patch) | |
| tree | 8f4a7b87310a1d781ce0f9c946f1f7907da63842 | |
| parent | Added ipv6 support. (diff) | |
| download | gentoo-2-de02c8b7bf9cae2bc72c4f387ff44637eee341d6.tar.gz gentoo-2-de02c8b7bf9cae2bc72c4f387ff44637eee341d6.tar.bz2 gentoo-2-de02c8b7bf9cae2bc72c4f387ff44637eee341d6.zip | |
more fixes to gcc2_flags(); bug #13907
| -rw-r--r-- | eclass/gcc.eclass | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/eclass/gcc.eclass b/eclass/gcc.eclass index 8ccc56c0aa73..fad9c15c4a68 100644 --- a/eclass/gcc.eclass +++ b/eclass/gcc.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/gcc.eclass,v 1.8 2002/11/10 15:15:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gcc.eclass,v 1.9 2003/01/19 23:36:03 azarah Exp $ # This eclass contains (or should) functions to get common info about gcc ECLASS=gcc @@ -118,28 +118,25 @@ gcc-libstdcxx-major-version() { } # This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>, -# bug #9016. +# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more +# fixes. # # Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3 gcc2_flags() { CFLAGS=${CFLAGS//pentium-mmx/i586} - CFLAGS=${CFLAGS//pentiumpro/i686} - CFLAGS=${CFLAGS//pentium?/i686} - CFLAGS=${CFLAGS//k6-?/k6} + CFLAGS=${CFLAGS//pentium[234]/i686} + CFLAGS=${CFLAGS//k6-[23]/k6} CFLAGS=${CFLAGS//athlon-tbird/i686} CFLAGS=${CFLAGS//athlon-4/i686} - CFLAGS=${CFLAGS//athlon-xp/i686} - CFLAGS=${CFLAGS//athlon-mp/i686} + CFLAGS=${CFLAGS//athlon-[xm]p/i686} CFLAGS=${CFLAGS//athlon/i686} CXXFLAGS=${CXXFLAGS//pentium-mmx/i586} - CXXFLAGS=${CXXFLAGS//pentiumpro/i686} - CXXFLAGS=${CXXFLAGS//pentium?/i686} - CXXFLAGS=${CXXFLAGS//k6-?/k6} + CXXFLAGS=${CXXFLAGS//pentium[234]/i686} + CXXFLAGS=${CXXFLAGS//k6-[23]/k6} CXXFLAGS=${CXXFLAGS//athlon-tbird/i686} CXXFLAGS=${CXXFLAGS//athlon-4/i686} - CXXFLAGS=${CXXFLAGS//athlon-xp/i686} - CXXFLAGS=${CXXFLAGS//athlon-mp/i686} + CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686} CXXFLAGS=${CXXFLAGS//athlon/i686} export CFLAGS CXXFLAGS |