Fix gcc version selection

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 05227d2..5ea51a8 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,62 +1,54 @@
 # Choose gcc version.
-# WARNING -- 2.95 currently only builds for i386, arm, mips*, and powerpc.
-# WARNING -- 2.95 does not currently build natively for the target.
-
-if CONFIG_DEVEL
-       comment "Gcc Options"
-endif
-
-
-config BR2_GCC_3_4
-       bool
-       default n
-       depends BR2_GCC_VERSION_3_4_3 || BR2_GCC_VERSION_4_0_0
 
 choice
-       prompt "GCC compiler Version" if CONFIG_DEVEL
-       default BR2_GCC_VERSION_3_3_5
+       prompt "GCC compiler Version" if TOOLCHAINOPTS
+       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.
 
-       config BR2_GCC_VERSION_3_3_5
-               bool "gcc 3.3.5"
 
-       config BR2_GCC_VERSION_3_4_3
-               bool "gcc 3.4.3"
-               select BR2_GCC_3_4
+       config GCC_VERSION_3_4_4
+               bool "gcc 3.4.4"
 
-       config BR2_GCC_VERSION_4_0_0
-               bool "gcc 4.0.0"
-               select BR2_GCC_3_4
+       config GCC_VERSION_3_4_5
+               bool "gcc 3.4.5"
 
-endchoice
+       config GCC_VERSION_3_4_6
+               bool "gcc 3.4.6"
 
-config BR2_GCC_VERSION
-       string
-       default "3.3.5"     if BR2_GCC_VERSION_3_3_5 || !CONFIG_DEVEL
-       default "3.4.3"     if BR2_GCC_VERSION_3_4_3 
-       default "4.0.0"     if BR2_GCC_VERSION_4_0_0
+       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 BR2_GCC_USE_SJLJ_EXCEPTIONS
-       string
-#      default "--enable-sjlj-exceptions"
-       default ""
-       help
-           Currently the unwind stuff seems to work for staticly linked apps
-           but not dynamic.  So use setjmp/longjmp exceptions by default.
+       config GCC_VERSION_4_0_3
+               bool "gcc 4.0.3"
+
+       config GCC_VERSION_4_1_0
+               bool "gcc 4.1.0"
+
+       config GCC_VERSION_4_1_1
+               bool "gcc 4.1.1"
+
+       config GCC_VERSION_4_2
+               bool "gcc 4.2 (20060709)"
 
-config BR2_EXTRA_GCC_CONFIG_OPTIONS
+endchoice
+
+config EXTRA_GCC_CONFIG_OPTIONS
        string
-       prompt "Additional gcc options" if CONFIG_DEVEL
+       prompt "Additional gcc options" if TOOLCHAINOPTS
        default ""
        help
            Any additional gcc options you may want to include....
 
-config BR2_INSTALL_LIBSTDCPP
+config INSTALL_LIBSTDCPP
        bool
-       prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
+       prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
        default y
        help
            Build/install c++ compiler and libstdc++?
 
+