X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/64017a106d715a43e26a69b5b4e7b17eb9948281..5d4f1a1841e6fb6debc5bf5fd8d9e31b9df12420:/openwrt/toolchain/gcc/Config.in

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index 3eedaeb18..ed39142b4 100644
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -10,11 +10,13 @@ endif
 config BR2_GCC_3_4
 	bool
 	default n
-	depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_3_4_5 || BR2_GCC_VERSION_4_0_1 || BR2_GCC_VERSION_4_0_2
+	depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_3_4_5 || BR2_GCC_VERSION_4_0_2
 
 choice
 	prompt "GCC compiler Version" if CONFIG_DEVEL
-	default BR2_GCC_VERSION_3_4_4
+	default BR2_GCC_VERSION_4_0_2 if BR2_LINUX_2_6_ARUBA
+	default BR2_GCC_VERSION_3_4_4 if BR2_LINUX_2_4_BRCM
+	default BR2_GCC_VERSION_3_4_5
 	help
 	  Select the version of gcc you wish to use.
 
@@ -26,21 +28,17 @@ choice
 		bool "gcc 3.4.5"
 		select BR2_GCC_3_4
 
-	config BR2_GCC_VERSION_4_0_1
-		bool "gcc 4.0.1"
-		select BR2_GCC_3_4
-		
 	config BR2_GCC_VERSION_4_0_2
 		bool "gcc 4.0.2"
 		select BR2_GCC_3_4
+		select BR2_PACKAGE_LIBGCC
 
 endchoice
 
 config BR2_GCC_VERSION
 	string
-	default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
-	default "3.4.5"     if BR2_GCC_VERSION_3_4_5
-	default "4.0.1"     if BR2_GCC_VERSION_4_0_1
+	default "3.4.4"     if BR2_GCC_VERSION_3_4_4
+	default "3.4.5"     if BR2_GCC_VERSION_3_4_5 || !CONFIG_DEVEL
 	default "4.0.2"     if BR2_GCC_VERSION_4_0_2