some more stuff that i missed before

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

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index 9dd7d0c..07a2446 100644 (file)
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -2,65 +2,62 @@
 # 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
+       depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_4_0_0 || BR2_GCC_VERSION_4_0_1
 
 choice
-       prompt "GCC compiler Version"
-       default BR2_GCC_VERSION_3_3_5
+       prompt "GCC compiler Version" if CONFIG_DEVEL
+       default BR2_GCC_VERSION_3_4_4
        help
          Select the version of gcc you wish to use.
 
-       config BR2_GCC_VERSION_3_3_3
-               bool "gcc 3.3.3"
-
-       config BR2_GCC_VERSION_3_3_4
-               bool "gcc 3.3.4"
-
-       config BR2_GCC_VERSION_3_3_5
-               bool "gcc 3.3.5"
+       config BR2_GCC_VERSION_3_4_4
+               bool "gcc 3.4.4"
+               select BR2_GCC_3_4
 
-       config BR2_GCC_VERSION_3_4_0
-               bool "gcc 3.4.0"
+       config BR2_GCC_VERSION_4_0_0
+               bool "gcc 4.0.0"
+               select BR2_GCC_3_4
 
-       config BR2_GCC_VERSION_3_4_1
-               bool "gcc 3.4.1"
-
-       config BR2_GCC_VERSION_3_4_2
-               bool "gcc 3.4.2"
-
-       config BR2_GCC_VERSION_3_4_3
-               bool "gcc 3.4.3"
+       config BR2_GCC_VERSION_4_0_1
+               bool "gcc 4.0.1"
+               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.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
-       default "3.4.3"     if BR2_GCC_VERSION_3_4_3
+       default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
+       default "4.0.0"     if BR2_GCC_VERSION_4_0_0
+       default "4.0.1"     if BR2_GCC_VERSION_4_0_1
 
 
 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++?