Fix gcc version selection

- default version for linux 2.4 broken in r6208
- brcm-2.6 needs an older compiler at least on wgt634u (don't ask me why...)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6209 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e5ee5bd..5ea51a8 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,8 +2,8 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_1_1
        default GCC_VERSION_3_4_6 if LINUX_2_4
+       default GCC_VERSION_4_1_1
        help
          Select the version of gcc you wish to use.
 

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 495c883..3ff5bbf 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -12,11 +12,9 @@ config GCC_VERSION
        default "4.1.1"
 
 if !TOOLCHAINOPTS
-       config GCC_VERSION_4_2
-               default n
-
        config GCC_VERSION_3_4_6
                default y if LINUX_2_4
+               default y if LINUX_2_6_BRCM
 endif