aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-18 12:05:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-18 12:05:02 +0000
commitc19411a7813f937458a4c7a9a816f791e54a0292 (patch)
tree36ff289233427cf3924410364300733e77438a84
parent7ef7ccea3b6e789e1d5a5d1f5fb420af2b00125b (diff)
downloadupstream-c19411a7813f937458a4c7a9a816f791e54a0292.tar.gz
upstream-c19411a7813f937458a4c7a9a816f791e54a0292.tar.bz2
upstream-c19411a7813f937458a4c7a9a816f791e54a0292.zip
toolchain: get rid of musl version kconfig symbol overloading
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36359 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/musl/Config.in8
-rw-r--r--toolchain/musl/Config.version16
2 files changed, 12 insertions, 12 deletions
diff --git a/toolchain/musl/Config.in b/toolchain/musl/Config.in
index 1d9f3f9d58..0d25fabc8b 100644
--- a/toolchain/musl/Config.in
+++ b/toolchain/musl/Config.in
@@ -3,14 +3,16 @@
choice
prompt "musl Version"
depends on TOOLCHAINOPTS && USE_MUSL
- default MUSL_VERSION_0_9_8
+ default MUSL_USE_VERSION_0_9_8
help
Select the version of musl you wish to use.
- config MUSL_VERSION_0_9_8
+ config MUSL_USE_VERSION_0_9_8
+ select MUSL_VERSION_0_9_8
bool "musl 0.9.8"
- config MUSL_VERSION_0_9_9
+ config MUSL_USE_VERSION_0_9_9
+ select MUSL_VERSION_0_9_9
bool "musl 0.9.9"
endchoice
diff --git a/toolchain/musl/Config.version b/toolchain/musl/Config.version
index bdefec9ef3..62e914cf22 100644
--- a/toolchain/musl/Config.version
+++ b/toolchain/musl/Config.version
@@ -1,18 +1,16 @@
+if USE_MUSL
+
config MUSL_VERSION
string
depends on USE_MUSL
default "0.9.8" if MUSL_VERSION_0_9_8
default "0.9.9" if MUSL_VERSION_0_9_9
- default "0.9.8"
-
-if !TOOLCHAINOPTS
- config MUSL_VERSION_0_9_8
- default y if USE_MUSL
- bool
+config MUSL_VERSION_0_9_8
+ default y if !TOOLCHAINOPTS
+ bool
- config MUSL_VERSION_0_9_9
- default y if USE_MUSL
- bool
+config MUSL_VERSION_0_9_9
+ bool
endif