fix menuconfig developer options structure

SVN-Revision: 3948
master
Felix Fietkau 19 years ago
parent 44c42b85ac
commit 92d8c26513
  1. 1
      openwrt/toolchain/Config.in
  2. 23
      openwrt/toolchain/gcc/Config.in
  3. 21
      openwrt/toolchain/gcc/Config.version

@ -50,3 +50,4 @@ config TARGET_OPTIMIZATION
help help
Optimizations to use when building for the target host. Optimizations to use when building for the target host.
source "toolchain/gcc/Config.version"

@ -1,14 +1,5 @@
# Choose gcc version. # 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 choice
prompt "GCC compiler Version" if TOOLCHAINOPTS prompt "GCC compiler Version" if TOOLCHAINOPTS
default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA
@ -41,19 +32,6 @@ choice
endchoice 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 config EXTRA_GCC_CONFIG_OPTIONS
string string
prompt "Additional gcc options" if TOOLCHAINOPTS prompt "Additional gcc options" if TOOLCHAINOPTS
@ -68,3 +46,4 @@ config INSTALL_LIBSTDCPP
help help
Build/install c++ compiler and libstdc++? Build/install c++ compiler and libstdc++?

@ -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
Loading…
Cancel
Save