aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
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
commit4aa6663599949ed0626eed810b66b2999bef1ef3 (patch)
tree46111be9b8e001571ca648ae6926c8f8cfb536e2 /toolchain
parent39463bf1464b7b687a2acfeebe0cf8b3bbec7c43 (diff)
downloadupstream-4aa6663599949ed0626eed810b66b2999bef1ef3.tar.gz
upstream-4aa6663599949ed0626eed810b66b2999bef1ef3.tar.bz2
upstream-4aa6663599949ed0626eed810b66b2999bef1ef3.zip
toolchain: get rid of uclibc version kconfig symbol overloading
SVN-Revision: 36356
Diffstat (limited to 'toolchain')
-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