aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-04-27 15:52:01 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-04-27 15:52:01 +0000
commitef588da41619ad44fd9ba4daafc4ee02ba17d9a1 (patch)
tree7f5c616341870c40b62b9e9f715aed3314286c50 /toolchain
parent07054deef3ba5e51f89c961bf1640b531e1eaefd (diff)
downloadmaster-187ad058-ef588da41619ad44fd9ba4daafc4ee02ba17d9a1.tar.gz
master-187ad058-ef588da41619ad44fd9ba4daafc4ee02ba17d9a1.tar.bz2
master-187ad058-ef588da41619ad44fd9ba4daafc4ee02ba17d9a1.zip
[toolchain] building uml on x86_64 w/ uClibc 0.9.29 is currently broken, select 0.9.30.1 which is working
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15450 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/Config.in1
-rw-r--r--toolchain/uClibc/Config.version2
2 files changed, 2 insertions, 1 deletions
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index e57543384b..74c38fe2dd 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -4,6 +4,7 @@ choice
prompt "uClibc Version"
depends on TOOLCHAINOPTS && USE_UCLIBC
default UCLIBC_VERSION_0_9_29
+ default UCLIBC_VERSION_0_9_30_1 if (TARGET_uml && x86_64)
help
Select the version of uClibc you wish to use.
diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index bc4ecca78e..96f13d9f25 100644
--- a/toolchain/uClibc/Config.version
+++ b/toolchain/uClibc/Config.version
@@ -2,7 +2,7 @@ config UCLIBC_VERSION
string
depends on USE_UCLIBC
default "0.9.29" if UCLIBC_VERSION_0_9_29
- default "0.9.30.1" if UCLIBC_VERSION_0_9_30_1
+ default "0.9.30.1" if UCLIBC_VERSION_0_9_30_1 || (TARGET_uml && x86_64)
default "0.9.30+nptl" if UCLIBC_VERSION_NPTL
default "0.9.29"