[tools] cmake: update to 2.8.7

[openwrt.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 84b50bb..c027be8 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -89,6 +89,7 @@ menuconfig TOOLCHAINOPTS
 menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
 menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS

+       depends !sparc

        default y       if powerpc64
        default n
        help
        default y       if powerpc64
        default n
        help


@@ -174,7 +175,11 @@ config INSIGHT
 
 config USE_UCLIBC
        bool
 
 config USE_UCLIBC
        bool

-       default y if !TOOLCHAINOPTS
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+
+config USE_EXTERNAL_LIBC
+       bool
+       default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN

 
 source "toolchain/gcc/Config.version"
 
 
 source "toolchain/gcc/Config.version"
 


@@ -196,8 +201,7 @@ config LIBC_VERSION
 
 config TARGET_SUFFIX
        string
 
 config TARGET_SUFFIX
        string

-       default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && EABI_SUPPORT
-       default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !EABI_SUPPORT
-       default "uclibcgnueabi"   if USE_UCLIBC && EABI_SUPPORT
-       default "uclibc"          if USE_UCLIBC && !EABI_SUPPORT
-
+       default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && (arm || armeb)
+       default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !(arm || armeb)
+       default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
+       default "uclibc"          if USE_UCLIBC && !(arm || armeb)