aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-18 12:04:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-18 12:04:55 +0000
commit68f2e7f9401bfed56244afb41969df36a4a31733 (patch)
tree7e3ab58a5b977d483d09062170e8e6ed344b9e60
parent4aa6663599949ed0626eed810b66b2999bef1ef3 (diff)
downloadupstream-68f2e7f9401bfed56244afb41969df36a4a31733.tar.gz
upstream-68f2e7f9401bfed56244afb41969df36a4a31733.tar.bz2
upstream-68f2e7f9401bfed56244afb41969df36a4a31733.zip
toolchain: get rid of eglibc version kconfig symbol overloading
SVN-Revision: 36358
-rw-r--r--toolchain/eglibc/Config.in14
-rw-r--r--toolchain/eglibc/Config.version16
2 files changed, 21 insertions, 9 deletions
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