aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-19 14:13:16 +0000
committerJohn Crispin <john@openwrt.org>2014-06-19 14:13:16 +0000
commitf98b58fcec74f7c7c87ab24a8e1d423458e405dd (patch)
tree13c10118b13f96eaf465dc64efe25c76a2fdd48c
parent0d5a6fd819f62d6110dc9ac122c63f40b436134a (diff)
downloadupstream-f98b58fcec74f7c7c87ab24a8e1d423458e405dd.tar.gz
upstream-f98b58fcec74f7c7c87ab24a8e1d423458e405dd.tar.bz2
upstream-f98b58fcec74f7c7c87ab24a8e1d423458e405dd.zip
toolchain: make the default eglibc selection work even if TOOLCHAINOPTS is not enabled
default config build fail on octeon without this. Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41273
-rw-r--r--toolchain/eglibc/Config.in7
-rw-r--r--toolchain/eglibc/Config.version11
2 files changed, 11 insertions, 7 deletions
diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index 2e76c744af..dd6bb4352f 100644
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -15,13 +15,6 @@ choice
endchoice
-config EGLIBC_REVISION
- string
- depends on TOOLCHAINOPTS && USE_EGLIBC
- default "18909" if EGLIBC_VERSION_2_15
- default "25243" if EGLIBC_VERSION_2_19
- default ""
-
menu "eglibc configuration"
depends on TOOLCHAINOPTS && USE_EGLIBC
source toolchain/eglibc/config/Config.in
diff --git a/toolchain/eglibc/Config.version b/toolchain/eglibc/Config.version
index 4542323169..3c0f0efe3c 100644
--- a/toolchain/eglibc/Config.version
+++ b/toolchain/eglibc/Config.version
@@ -12,4 +12,15 @@ config EGLIBC_VERSION_2_19
default y if !TOOLCHAINOPTS
bool
+config EGLIBC_REVISION
+ string
+ default "18909" if EGLIBC_VERSION_2_15
+ default "25243" if EGLIBC_VERSION_2_19
+ default ""
+
endif
+
+menu "eglibc configuration"
+ depends on !TOOLCHAINOPTS && USE_EGLIBC
+ source toolchain/eglibc/config/Config.in
+endmenu