aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-10-20 09:14:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-10-20 09:14:25 +0000
commit6c2b49cf236e51121db341c32744b01540f2fa37 (patch)
tree225c9872eaa08f6067ad55397a043989a00dbb56
parent82fcc3bef3d1fc3a8a7afaabb3ca2a15ee29d68b (diff)
downloadupstream-6c2b49cf236e51121db341c32744b01540f2fa37.tar.gz
upstream-6c2b49cf236e51121db341c32744b01540f2fa37.tar.bz2
upstream-6c2b49cf236e51121db341c32744b01540f2fa37.zip
fix potential inconsistencies in toolchain selection on linux 2.4
SVN-Revision: 18097
-rw-r--r--toolchain/gcc/Config.version8
1 files changed, 7 insertions, 1 deletions
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 631bd66bb6..72d6348fc1 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -18,7 +18,9 @@ config GCC_VERSION_3
config GCC_VERSION_3_4
bool
default y if GCC_VERSION_3_4_6
-
+
+if !LINUX_2_4
+
config GCC_VERSION_4
bool
default y if GCC_VERSION_4_1
@@ -46,10 +48,13 @@ config GCC_VERSION_4_4
default y if GCC_VERSION_4_4_0
default y if GCC_VERSION_4_4_1
+endif
+
if !TOOLCHAINOPTS
config GCC_VERSION_3_4_6
default y if LINUX_2_4
+if !LINUX_2_4
config GCC_VERSION_4_2_4
default y if TARGET_avr32
default y if TARGET_ppc40x
@@ -70,3 +75,4 @@ if !TOOLCHAINOPTS
config GCC_VERSION_4_4_1
default y if TARGET_octeon
endif
+endif