gcc: always explicitly link against libstdc++, fixes build errors on some hosts that...

[openwrt.git] / toolchain / uClibc / Config.in

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 6c89fd2..36bb880 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,29 +1,21 @@
 # Choose uclibc version.
 
 choice
-       prompt "uClibc Version" if TOOLCHAINOPTS
-       default UCLIBC_VERSION_0_9_29
+       prompt "uClibc Version"
+       depends on TOOLCHAINOPTS && USE_UCLIBC
+       default UCLIBC_VERSION_0_9_32
        help
          Select the version of uClibc you wish to use.
-         Default for kernel 2.6 is 0.9.29, for kernel 2.4 it is 0.9.28 .
 
-       config UCLIBC_VERSION_SNAPSHOT
-               bool "uClibc snapshot"
+       config UCLIBC_VERSION_0_9_32
+               bool "uClibc 0.9.32-git"
 
-       config UCLIBC_VERSION_0_9_28
-               bool "uClibc 0.9.28"
+endchoice
 
-       config UCLIBC_VERSION_0_9_29
-               bool "uClibc 0.9.29"
 
-endchoice
+# Debug version.
 
-config UCLIBC_EXTRA_VERSION
-       string
-       prompt "Extra uClibc version" if TOOLCHAINOPTS
-       default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
-       default ".2"         if UCLIBC_VERSION_0_9_28
-       default ""
-       help
-           Default for version 0.9.28 is ".02", for daily snapshot it's just "snapshot"
-           For all other versions the default string is empty.
+config UCLIBC_ENABLE_DEBUG
+       bool "Build with debug information"
+       depends on TOOLCHAINOPTS && USE_UCLIBC
+       default n