Fix gcc version selection

[openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 4912907..5ea51a8 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,19 +1,9 @@
 # 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
-       default GCC_VERSION_3_4_4 if LINUX_2_4_BRCM
-       default GCC_VERSION_3_4_6
+       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.
 
@@ -27,6 +17,9 @@ choice
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 
+       config GCC_VERSION_3_4_6_nonmips
+               bool "gcc 3.4.6-nonmips"
+
        config GCC_VERSION_4_0_2
                bool "gcc 4.0.2"
 
@@ -39,20 +32,10 @@ choice
        config GCC_VERSION_4_1_1
                bool "gcc 4.1.1"
 
-endchoice
-
-config GCC_VERSION
-       string
-       prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL)
-       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
-       default "4.1.0"     if GCC_VERSION_4_1_0
-       default "4.1.1"     if GCC_VERSION_4_1_1
-       default "3.4.6"
+       config GCC_VERSION_4_2
+               bool "gcc 4.2 (20060709)"
 
+endchoice
 
 config EXTRA_GCC_CONFIG_OPTIONS
        string
@@ -68,3 +51,4 @@ config INSTALL_LIBSTDCPP
        help
            Build/install c++ compiler and libstdc++?
 
+