fix gcc compile

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 681f139..f5f27c6 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,8 +2,7 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 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_4_1_1 if LINUX_2_6_ARUBA

        default GCC_VERSION_3_4_6
        help
          Select the version of gcc you wish to use.
        default GCC_VERSION_3_4_6
        help
          Select the version of gcc you wish to use.


@@ -18,6 +17,9 @@ choice
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 
        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"
 
        config GCC_VERSION_4_0_2
                bool "gcc 4.0.2"
 


@@ -32,19 +34,6 @@ choice
 
 endchoice
 
 
 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.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.1.0"     if GCC_VERSION_4_1_0
-       default "4.1.1"     if GCC_VERSION_4_1_1
-       default "3.4.6"
-
-

 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc options" if TOOLCHAINOPTS
 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc options" if TOOLCHAINOPTS


@@ -59,3 +48,4 @@ config INSTALL_LIBSTDCPP
        help
            Build/install c++ compiler and libstdc++?
 
        help
            Build/install c++ compiler and libstdc++?
 

+