X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=7d70d0691cb8bae8f3c1b84a05a01afab16c29e7;hb=547f8e3d53267a0cc8f2bab9c1af76806e840ddb;hp=9403aba278a7fbf1441fdb832f632012c4c76986;hpb=2f006aa5e8a74e2dd224f5e9b90d36c79651fd66;p=openwrt-10.03%2F.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 9403aba27..7d70d0691 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,18 +2,16 @@
 # 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
 
 choice
-	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_3_4_2
+	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"
 
@@ -39,10 +37,9 @@ 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
@@ -57,20 +54,16 @@ config BR2_GCC_USE_SJLJ_EXCEPTIONS
 	    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++?"
+	bool
+	prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
 	default n
 	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?