diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125.ebuild | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild index 6ba2085b10e6..6af7a487b0d8 100644 --- a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.21 2005/02/14 03:12:49 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.22 2005/02/14 03:28:31 eradicator Exp $ KEYWORDS="~amd64 ~mips ~sparc ~x86" @@ -565,20 +565,16 @@ setup_flags() { default|sparc) if is-flag "-mcpu=ultrasparc3"; then CHOST_OPT="sparcv9b-unknown-linux-gnu" - tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} else CHOST_OPT="sparcv9-unknown-linux-gnu" - tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} fi ;; sparc64) if is-flag "-mcpu=ultrasparc3"; then CHOST_OPT="sparc64b-unknown-linux-gnu" - tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b" else CHOST_OPT="sparc64-unknown-linux-gnu" - tc-is-cross-compiler || CBUILD_OPT=${CHOST_OPT} CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a" fi @@ -588,15 +584,17 @@ setup_flags() { else if is-flag "-mcpu=ultrasparc3"; then CHOST_OPT="sparcv9b-unknown-linux-gnu" - CBUILD_OPT=${CHOST_OPT} elif { tc-is-cross-compiler && use nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then CHOST_OPT="sparcv9-unknown-linux-gnu" - CBUILD_OPT=${CHOST_OPT} fi fi ;; esac + if [[ -n "${CHOST_OPT}" ]] && ! tc-is-cross-compiler; then + CBUILD_OPT=${CHOST_OPT} + fi + if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then # broken in 3.4.x replace-flags -march=pentium-m -mtune=pentium3 |