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
commit9f627dbf6e018c2c61ea3254b4ab9d80ae70c213 (patch)
tree59ad649b99dde2717c1dbc217c91891ac9bce69b /toolchain
parentb558d4b839b76f99282b98ef5542caf5ea0dce6a (diff)
downloadupstream-9f627dbf6e018c2c61ea3254b4ab9d80ae70c213.tar.gz
upstream-9f627dbf6e018c2c61ea3254b4ab9d80ae70c213.tar.bz2
upstream-9f627dbf6e018c2c61ea3254b4ab9d80ae70c213.zip
building uml on x86_64 w/ uClibc 0.9.29 is currently broken, select 0.9.30.1 which is working
SVN-Revision: 15450
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"