From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 18 Apr 2013 12:04:55 +0000 (+0000)
Subject: toolchain: get rid of eglibc version kconfig symbol overloading
X-Git-Tag: fast2504n-3.10.28-merged~2776
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=16768cac5b7af0bf837de490af4b9831851c137b;p=openwrt.git

toolchain: get rid of eglibc version kconfig symbol overloading

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36358 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index de5c5b429d..791033662a 100644
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -1,21 +1,21 @@
 choice
 	prompt "eglibc version"
 	depends on TOOLCHAINOPTS && USE_EGLIBC
-	default EGLIBC_VERSION_2_15
+	default EGLIBC_USE_VERSION_2_15
 	help
 	  Select the version of eglibc you wish to use.
 
-	config EGLIBC_VERSION_2_15
+	config EGLIBC_USE_VERSION_2_15
 		bool "eglibc 2.15"
-		depends on !GCC_VERSION_LLVM
+		select EGLIBC_VERSION_2_15
 
-	config EGLIBC_VERSION_2_16
+	config EGLIBC_USE_VERSION_2_16
 		bool "eglibc 2.16"
-		depends on !GCC_VERSION_LLVM
+		select EGLIBC_VERSION_2_16
 
-	config EGLIBC_VERSION_2_17
+	config EGLIBC_USE_VERSION_2_17
 		bool "eglibc 2.17"
-		depends on !GCC_VERSION_LLVM
+		select EGLIBC_VERSION_2_17
 
 endchoice
 
diff --git a/toolchain/eglibc/Config.version b/toolchain/eglibc/Config.version
index 92ba3e6ee0..a383bb211d 100644
--- a/toolchain/eglibc/Config.version
+++ b/toolchain/eglibc/Config.version
@@ -1,7 +1,19 @@
+if USE_EGLIBC
+
 config EGLIBC_VERSION
 	string
-	depends on USE_EGLIBC
 	default "2.15" if EGLIBC_VERSION_2_15
 	default "2.16" if EGLIBC_VERSION_2_16
 	default "2.17" if EGLIBC_VERSION_2_17
-	default "2.15"
+
+config EGLIBC_VERSION_2_15
+	default y if !TOOLCHAINOPTS
+	bool
+
+config EGLIBC_VERSION_2_16
+	bool
+
+config EGLIBC_VERSION_2_17
+	bool
+
+endif