aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/uClibc
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-18 12:04:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-18 12:04:48 +0000
commit6add3f9184b20e24c0c0889aa66eb53b6b183045 (patch)
tree26bb7bad83bf05e7408bb247fa22cd7dac0cd821 /toolchain/uClibc
parent99392df05aa0d9268fa18ad3227a92f247d4ec95 (diff)
downloadupstream-6add3f9184b20e24c0c0889aa66eb53b6b183045.tar.gz
upstream-6add3f9184b20e24c0c0889aa66eb53b6b183045.tar.bz2
upstream-6add3f9184b20e24c0c0889aa66eb53b6b183045.zip
toolchain: get rid of uclibc version kconfig symbol overloading
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36356 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc')
-rw-r--r--toolchain/uClibc/Config.in6
-rw-r--r--toolchain/uClibc/Config.version10
2 files changed, 6 insertions, 10 deletions
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