diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2007-01-26 10:55:06 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2007-01-26 10:55:06 +0000 |
| commit | 23813f6c77ad5e198f2ee7166594375fb0593527 (patch) | |
| tree | 3a6945eb913ec835a3f1412f89f7d819a06a5452 /toolchain/gcc | |
| parent | 5b261403c26cd72b8c43db4b0fa907f2171aa6ba (diff) | |
| download | upstream-23813f6c77ad5e198f2ee7166594375fb0593527.tar.gz upstream-23813f6c77ad5e198f2ee7166594375fb0593527.tar.bz2 upstream-23813f6c77ad5e198f2ee7166594375fb0593527.zip | |
use gcc 4.1.1 for 2.6, 3.4.6 for 2.4 targets by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6208 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc')
| -rw-r--r-- | toolchain/gcc/Config.in | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 55ab7e5548..e5ee5bd574 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 if LINUX_2_6_ARUBA - default GCC_VERSION_3_4_6 + default GCC_VERSION_4_1_1 + default GCC_VERSION_3_4_6 if LINUX_2_4 help Select the version of gcc you wish to use. diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 397dfa4986..495c883c7f 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -9,14 +9,14 @@ config GCC_VERSION default "4.1.1" if GCC_VERSION_4_1_1 default "4.2" if GCC_VERSION_4_2 default "3.4.6-nonmips" if GCC_VERSION_3_4_6_nonmips - default "3.4.6" + default "4.1.1" if !TOOLCHAINOPTS config GCC_VERSION_4_2 default n - config GCC_VERSION_4_1_1 - default y if LINUX_2_6_ARUBA || LINUX_2_6_IXP4XX || LINUX_2_6_RB532 || LINUX_2_6_X86 + config GCC_VERSION_3_4_6 + default y if LINUX_2_4 endif |