From: nbd Date: Thu, 18 Apr 2013 12:04:48 +0000 (+0000) Subject: toolchain: get rid of uclibc version kconfig symbol overloading X-Git-Tag: fast2504n-3.10.28-merged~2777 X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=643e08718bde9507f1f76c55517f41c71ce4db8a;p=openwrt.git toolchain: get rid of uclibc version kconfig symbol overloading git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36356 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 74d15ae33d..08ea00a313 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -3,16 +3,16 @@ choice prompt "uClibc Version" depends on TOOLCHAINOPTS && USE_UCLIBC - default UCLIBC_VERSION_0_9_33 + default UCLIBC_USE_VERSION_0_9_33 help Select the version of uClibc you wish to use. - config UCLIBC_VERSION_0_9_33 + config UCLIBC_USE_VERSION_0_9_33 + select UCLIBC_VERSION_0_9_33 bool "uClibc 0.9.33.2" endchoice - # Debug version. config UCLIBC_ENABLE_DEBUG diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version index 0d0b4a76a3..dd302f256b 100644 --- a/toolchain/uClibc/Config.version +++ b/toolchain/uClibc/Config.version @@ -4,10 +4,6 @@ config UCLIBC_VERSION default "0.9.33.2" if UCLIBC_VERSION_0_9_33 default "0.9.33.2" -if !TOOLCHAINOPTS - - config UCLIBC_VERSION_0_9_33 - default y if USE_UCLIBC - bool - -endif +config UCLIBC_VERSION_0_9_33 + default y if !TOOLCHAINOPTS && USE_UCLIBC + bool