diff options
| -rw-r--r-- | toolchain/Config.in | 1 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 23 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 21 |
3 files changed, 23 insertions, 22 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in index 3f0d13fe9c..5720beb8b0 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -50,3 +50,4 @@ config TARGET_OPTIMIZATION help Optimizations to use when building for the target host. +source "toolchain/gcc/Config.version" diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 4912907340..6c584db405 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -1,14 +1,5 @@ # Choose gcc version. -if !TOOLCHAINOPTS - config GCC_VERSION_3_4_4 - default y if LINUX_2_4_BRCM - - config GCC_VERSION_4_0_3 - default y if LINUX_2_6_ARUBA - -endif - choice prompt "GCC compiler Version" if TOOLCHAINOPTS default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA @@ -41,19 +32,6 @@ choice endchoice -config GCC_VERSION - string - prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL) - default "3.4.4" if GCC_VERSION_3_4_4 - default "3.4.5" if GCC_VERSION_3_4_5 - default "3.4.6" if GCC_VERSION_3_4_6 - default "4.0.2" if GCC_VERSION_4_0_2 - default "4.0.3" if GCC_VERSION_4_0_3 - default "4.1.0" if GCC_VERSION_4_1_0 - default "4.1.1" if GCC_VERSION_4_1_1 - default "3.4.6" - - config EXTRA_GCC_CONFIG_OPTIONS string prompt "Additional gcc options" if TOOLCHAINOPTS @@ -68,3 +46,4 @@ config INSTALL_LIBSTDCPP help Build/install c++ compiler and libstdc++? + diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version new file mode 100644 index 0000000000..80e2606052 --- /dev/null +++ b/toolchain/gcc/Config.version @@ -0,0 +1,21 @@ +config GCC_VERSION + string + default "3.4.4" if GCC_VERSION_3_4_4 + default "3.4.5" if GCC_VERSION_3_4_5 + default "3.4.6" if GCC_VERSION_3_4_6 + default "4.0.2" if GCC_VERSION_4_0_2 + default "4.0.3" if GCC_VERSION_4_0_3 + default "4.1.0" if GCC_VERSION_4_1_0 + default "4.1.1" if GCC_VERSION_4_1_1 + default "3.4.6" + +if !TOOLCHAINOPTS + config GCC_VERSION_3_4_4 + default y if LINUX_2_4_BRCM + + config GCC_VERSION_4_0_3 + default y if LINUX_2_6_ARUBA + +endif + + |