From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 15 Jun 2006 13:44:26 +0000 (+0000)
Subject: fix gcc version selection
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=3dd2665c70d2d36ae1e43121678d8fa39f901876

fix gcc version selection

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3947 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 681f1399a..491290734 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,5 +1,14 @@
 # Choose gcc version.
 
+if !TOOLCHAINOPTS
+	config GCC_VERSION_3_4_4
+		default y if LINUX_2_4_BRCM
+		
+	config GCC_VERSION_4_0_3
+		default y if LINUX_2_6_ARUBA
+
+endif
+
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA
@@ -35,11 +44,11 @@ endchoice
 config GCC_VERSION
 	string
 	prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL)
-	default "3.4.4"     if GCC_VERSION_3_4_4 || LINUX_2_4_BRCM
+	default "3.4.4"     if GCC_VERSION_3_4_4
 	default "3.4.5"     if GCC_VERSION_3_4_5
 	default "3.4.6"     if GCC_VERSION_3_4_6
 	default "4.0.2"     if GCC_VERSION_4_0_2
-	default "4.0.3"     if GCC_VERSION_4_0_3 || LINUX_2_6_ARUBA
+	default "4.0.3"     if GCC_VERSION_4_0_3
 	default "4.1.0"     if GCC_VERSION_4_1_0
 	default "4.1.1"     if GCC_VERSION_4_1_1
 	default "3.4.6"