fix potential inconsistencies in toolchain selection on linux 2.4
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 20 Oct 2009 09:14:25 +0000 (09:14 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 20 Oct 2009 09:14:25 +0000 (09:14 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18097 3c298f89-4303-0410-b956-a3cf2f4a3e73

toolchain/gcc/Config.version

index 631bd66bb6cb749c17d7c67c4e03960cdcfe29b6..72d6348fc126feb3a2d108fc73452ff177baaeca 100644 (file)
@@ -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