From ae74d3d6f1fc0b4a5dc1115e114873fc9d4b87f6 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 20 Oct 2009 09:14:25 +0000 Subject: [PATCH] fix potential inconsistencies in toolchain selection on linux 2.4 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18097 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/gcc/Config.version | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 631bd66bb..72d6348fc 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