From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 20 Oct 2009 09:14:25 +0000 (+0000)
Subject: fix potential inconsistencies in toolchain selection on linux 2.4
X-Git-Tag: reboot~22134
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6c2b49cf236e51121db341c32744b01540f2fa37;p=openwrt%2Fstaging%2Flynxis.git

fix potential inconsistencies in toolchain selection on linux 2.4

SVN-Revision: 18097
---

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