Fix the imagebuilder generation (does not mean it works with the recent changes)

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e5ee5bd..ebacf69 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,38 +2,26 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 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_3_4_6 if LINUX_2_4

+       default GCC_VERSION_4_2_0 if LINUX_2_6_MAGICBOX
+       default GCC_VERSION_4_1_2

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

-
-       config GCC_VERSION_3_4_4
-               bool "gcc 3.4.4"
-
-       config GCC_VERSION_3_4_5
-               bool "gcc 3.4.5"
-

        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_3
-               bool "gcc 4.0.3"
+       config GCC_VERSION_4_1_2
+               depends !LINUX_2_4
+               bool "gcc 4.1.2"

 
 

-       config GCC_VERSION_4_1_0
-               bool "gcc 4.1.0"
+       config GCC_VERSION_4_2_0
+               depends !LINUX_2_4
+               bool "gcc 4.2.0"

 
 

-       config GCC_VERSION_4_1_1
-               bool "gcc 4.1.1"
-
-       config GCC_VERSION_4_2
-               bool "gcc 4.2 (20060709)"
+       config GCC_VERSION_4_2_1
+               depends !LINUX_2_4
+               bool "gcc 4.2.1"

 
 endchoice
 
 
 endchoice
 


@@ -51,4 +39,9 @@ config INSTALL_LIBSTDCPP
        help
            Build/install c++ compiler and libstdc++?
 
        help
            Build/install c++ compiler and libstdc++?
 

-
+config INSTALL_LIBGCJ
+       bool
+       prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
+       default n
+       help
+           Build/install java compiler and GNU classpath ?