summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-20 21:24:57 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-20 21:24:57 +0000
commit7492d24af3d714bb04d1c793303dc6c307445abf (patch)
tree7cb35cd2d31db7860925ffe3216fe0d117c15631
parentb02969aed07be552589a5f7df43ee072d638f43a (diff)
fix pesky libgcc issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3420 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/gcc/Config.in14
1 files changed, 12 insertions, 2 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 58f91ddba..450ef6ebf 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -6,6 +6,10 @@ if CONFIG_DEVEL
comment "Gcc Options"
endif
+
+# the choice option below is completely ignored
+# if CONFIG_DEVEL isn't set, so we have to set
+# these manually ... annoying.
config BR2_GCC_VERSION_3_4_4
bool
default y if BR2_LINUX_2_4_BRCM
@@ -22,6 +26,7 @@ choice
help
Select the version of gcc you wish to use.
+
config BR2_GCC_VERSION_3_4_4
bool "gcc 3.4.4"
@@ -33,14 +38,19 @@ choice
config BR2_GCC_VERSION_4_0_2
bool "gcc 4.0.2"
- select BR2_PACKAGE_LIBGCC
config BR2_GCC_VERSION_4_1_0
bool "gcc 4.1.0"
- select BR2_PACKAGE_LIBGCC
endchoice
+# more nasty hacks
+config BR2_PACKAGE_LIBGCC
+ tristate
+ default y if BR2_GCC_VERSION_4_0_2 || BR2_GCC_VERSION_4_1_0
+ default m if CONFIG_DEVEL
+ default n
+
config BR2_GCC_VERSION
string
default "3.4.4" if BR2_GCC_VERSION_3_4_4