From eac34742573858afb75d9bc8fbf00fb4d07e0c15 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 18 Apr 2013 12:05:02 +0000
Subject: [PATCH] toolchain: get rid of musl version kconfig symbol overloading

SVN-Revision: 36359
---
 toolchain/musl/Config.in      |  8 +++++---
 toolchain/musl/Config.version | 16 +++++++---------
 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 !TOOLCHAINOPTS
+	bool
 
-	config MUSL_VERSION_0_9_8
-		default y if USE_MUSL
-		bool
-
-	config MUSL_VERSION_0_9_9
-		default y if USE_MUSL
-		bool
+config MUSL_VERSION_0_9_9
+	bool
 
 endif