fix nfs-server with gcc 3.4

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index c23cb39da69abb43c32c04006f1c7962a4b17c2d..e618bc67bc691c40d586d487f7fb00b87e496ae9 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,18 +2,21 @@
 # WARNING -- 2.95 currently only builds for i386, arm, mips*, and powerpc.
 # WARNING -- 2.95 does not currently build natively for the target.
 
-comment "Gcc Options"
+if CONFIG_DEVEL
+       comment "Gcc Options"
+endif
+
+
+config BR2_GCC_3_4
+       bool
+       default n
 
 choice
-       prompt "GCC compiler Version"
+       prompt "GCC compiler Version" if CONFIG_DEVEL
        default BR2_GCC_VERSION_3_3_5
        help
          Select the version of gcc you wish to use.
 
-       config BR2_GCC_VERSION_2_95
-               bool "gcc 2.95"
-               depends on BR2_arm || BR2_i386 || BR2_mips || BR2_powerpc
-
        config BR2_GCC_VERSION_3_3_3
                bool "gcc 3.3.3"
 
@@ -25,24 +28,27 @@ choice
 
        config BR2_GCC_VERSION_3_4_0
                bool "gcc 3.4.0"
+               select BR2_GCC_3_4
 
        config BR2_GCC_VERSION_3_4_1
                bool "gcc 3.4.1"
+               select BR2_GCC_3_4
 
        config BR2_GCC_VERSION_3_4_2
                bool "gcc 3.4.2"
+               select BR2_GCC_3_4
 
        config BR2_GCC_VERSION_3_4_3
                bool "gcc 3.4.3"
+               select BR2_GCC_3_4
 
 endchoice
 
 config BR2_GCC_VERSION
        string
-       default "2.95"      if BR2_GCC_VERSION_2_95
        default "3.3.3"     if BR2_GCC_VERSION_3_3_3
        default "3.3.4"     if BR2_GCC_VERSION_3_3_4
-       default "3.3.5"     if BR2_GCC_VERSION_3_3_5
+       default "3.3.5"     if BR2_GCC_VERSION_3_3_5 || !CONFIG_DEVEL
        default "3.4.0"     if BR2_GCC_VERSION_3_4_0
        default "3.4.1"     if BR2_GCC_VERSION_3_4_1
        default "3.4.2"     if BR2_GCC_VERSION_3_4_2
@@ -51,26 +57,23 @@ config BR2_GCC_VERSION
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS
        string
-       default "--enable-sjlj-exceptions"
+#      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 BR2_EXTRA_GCC_CONFIG_OPTIONS
-       string "Additional gcc options"
+       string
+       prompt "Additional gcc options" if CONFIG_DEVEL
        default ""
        help
            Any additional gcc options you may want to include....
 
 config BR2_INSTALL_LIBSTDCPP
-       bool "Build/install c++ compiler and libstdc++?"
-       default n
+       bool
+       prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
+       default y
        help
            Build/install c++ compiler and libstdc++?
 
-config BR2_INSTALL_LIBGCJ
-       bool "Build/install java compiler and libgcj?"
-       default n
-       depends on BR2_INSTALL_LIBSTDCPP
-       help
-           Build/install java compiler and libgcj?