aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/gcc
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-26 11:02:59 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-26 11:02:59 +0000
commit69d550862ee0b47ae3e946d8265c614eeb0f6247 (patch)
treebf608edf004dde245b3dcd345cc9f35e9217b663 /toolchain/gcc
parent23813f6c77ad5e198f2ee7166594375fb0593527 (diff)
downloadupstream-69d550862ee0b47ae3e946d8265c614eeb0f6247.tar.gz
upstream-69d550862ee0b47ae3e946d8265c614eeb0f6247.tar.bz2
upstream-69d550862ee0b47ae3e946d8265c614eeb0f6247.zip
Fix gcc version selection
- default version for linux 2.4 broken in r6208 - brcm-2.6 needs an older compiler at least on wgt634u (don't ask me why...) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6209 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc')
-rw-r--r--toolchain/gcc/Config.in2
-rw-r--r--toolchain/gcc/Config.version4
2 files changed, 2 insertions, 4 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e5ee5bd574..5ea51a8ad0 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,8 +2,8 @@
choice
prompt "GCC compiler Version" if TOOLCHAINOPTS
- default GCC_VERSION_4_1_1
default GCC_VERSION_3_4_6 if LINUX_2_4
+ default GCC_VERSION_4_1_1
help
Select the version of gcc you wish to use.
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 495c883c7f..3ff5bbf307 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -12,11 +12,9 @@ config GCC_VERSION
default "4.1.1"
if !TOOLCHAINOPTS
- config GCC_VERSION_4_2
- default n
-
config GCC_VERSION_3_4_6
default y if LINUX_2_4
+ default y if LINUX_2_6_BRCM
endif