aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-03-19 03:50:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-03-19 03:50:18 +0000
commit3b9866830e7dd56adccacd1ce797c5166ac095bb (patch)
treeac70b10c5a5c128666d2c7a7f60d9ea01a7f3010
parent57016f897d53782a8b66dbc0f60a0a66f5c901c2 (diff)
downloadupstream-3b9866830e7dd56adccacd1ce797c5166ac095bb.tar.gz
upstream-3b9866830e7dd56adccacd1ce797c5166ac095bb.tar.bz2
upstream-3b9866830e7dd56adccacd1ce797c5166ac095bb.zip
fix gcc menuconfig defaults
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3406 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/toolchain/gcc/Config.in13
1 files changed, 11 insertions, 2 deletions
diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index 9e65aad59f3..e97b22fadd7 100644
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -12,11 +12,19 @@ config BR2_GCC_3_4
default n
depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_3_4_5 || BR2_GCC_VERSION_3_4_6 || BR2_GCC_VERSION_4_0_2 || BR2_GCC_VERSION_4_1_0
+config BR2_GCC_VERSION_3_4_4
+ bool
+ default y if BR2_LINUX_2_4_BRCM
+
+config BR2_GCC_VERSION_4_0_2
+ bool
+ default y if BR2_LINUX_2_6_ARUBA
+
choice
prompt "GCC compiler Version" if CONFIG_DEVEL
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
+ default BR2_GCC_VERSION_3_4_6
help
Select the version of gcc you wish to use.
@@ -47,10 +55,11 @@ endchoice
config BR2_GCC_VERSION
string
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 "3.4.5" if BR2_GCC_VERSION_3_4_5
default "3.4.6" if BR2_GCC_VERSION_3_4_6
default "4.0.2" if BR2_GCC_VERSION_4_0_2
default "4.1.0" if BR2_GCC_VERSION_4_1_0
+ default "3.4.6"
config BR2_GCC_USE_SJLJ_EXCEPTIONS