Don't do the --with-arch thing if arm_arch isn't armv*, as it breaks arm{,eb}-{softfl...

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7009b3ecd72bd105f2c0bedf1da1baf8431b8783..b097eaecda0f736f2387a7d8c646717bbab71409 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.418 2010/02/28 18:26:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.419 2010/03/06 14:50:02 armin76 Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1233,13 +1233,16 @@ gcc-compiler-configure() {
                # bug #264534
                arm)
                        local arm_arch="${CTARGET%%-*}"
-                       # Convert armv7{a,r,m} to armv7-{a,r,m}
-                       [[ ! -z "${arm_arch##armv7}" ]] && arm_arch="${arm_arch/armv7/armv7-}"
-                       # Remove 'l'
-                       [[ -z "${arm_arch##armv*l}" ]] && arm_arch="${arm_arch/l/}"
-                       # Remove 'eb'
-                       [[ -z "${arm_arch##armv*eb}" ]] && arm_arch="${arm_arch/eb/}"
-                       confgcc="${confgcc} --with-arch=${arm_arch}"
+                       # Only do this if arm_arch is armv*
+                       if [[ -z "${arm_arch##armv*}" ]]; then
+                               # Convert armv7{a,r,m} to armv7-{a,r,m}
+                               [[ ! -z "${arm_arch##armv7}" ]] && arm_arch="${arm_arch/armv7/armv7-}"
+                               # Remove 'l'
+                               [[ -z "${arm_arch##armv*l}" ]] && arm_arch="${arm_arch/l/}"
+                               # Remove 'eb'
+                               [[ -z "${arm_arch##armv*eb}" ]] && arm_arch="${arm_arch/eb/}"
+                               confgcc="${confgcc} --with-arch=${arm_arch}"
+                       fi
                        ;;
                # Add --with-abi flags to set default MIPS ABI
                mips)