busybox: fix issues with static routes and 6rd option parsing (thx, Florian Fuessl)

[openwrt.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index df4ad84..7545032 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,18 +1,95 @@
 #
-config NATIVE_TOOLCHAIN
+
+menuconfig EXTERNAL_TOOLCHAIN
        bool
-       prompt "Use host's toolchain" if DEVEL && BROKEN
-       default n
+       prompt "Use external toolchain"  if DEVEL
        help
-               If enabled, OpenWrt will compile using your existing toolchain instead of compiling one
+         If enabled, OpenWrt will compile using an existing toolchain instead of compiling one
+
+       config NATIVE_TOOLCHAIN
+               bool
+               prompt "Use host's toolchain"  if DEVEL
+               depends EXTERNAL_TOOLCHAIN
+               select NO_STRIP
+               help
+                 If enabled, OpenWrt will compile using the native toolchain for your host instead of compiling one
+
+       config TARGET_NAME
+               string
+               prompt "Target name"  if DEVEL
+               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               default "arm-unknown-linux-gnu"      if arm
+               default "armeb-unknown-linux-gnu"    if armeb
+               default "i486-unknown-linux-gnu"     if i386
+               default "mips-unknown-linux-gnu"     if mips
+               default "mipsel-unknown-linux-gnu"   if mipsel
+               default "powerpc-unknown-linux-gnu"  if powerpc
+               default "x86_64-unknown-linux-gnu"   if x86_64
+
+       config TOOLCHAIN_PREFIX
+               string
+               prompt "Toolchain prefix"  if DEVEL
+               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               default "arm-unknown-linux-gnu-"      if arm
+               default "armeb-unknown-linux-gnu-"    if armeb
+               default "i486-unknown-linux-gnu-"     if i386
+               default "mips-unknown-linux-gnu-"     if mips
+               default "mipsel-unknown-linux-gnu-"   if mipsel
+               default "powerpc-unknown-linux-gnu-"  if powerpc
+               default "x86_64-unknown-linux-gnu-"   if x86_64
+
+       config TOOLCHAIN_ROOT
+               string
+               prompt "Toolchain root"  if DEVEL
+               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               default "/opt/cross/arm-unknown-linux-gnu"      if arm
+               default "/opt/cross/armeb-unknown-linux-gnu"    if armeb
+               default "/opt/cross/i486-unknown-linux-gnu"     if i386
+               default "/opt/cross/mips-unknown-linux-gnu"     if mips
+               default "/opt/cross/mipsel-unknown-linux-gnu"   if mipsel
+               default "/opt/cross/powerpc-unknown-linux-gnu"  if powerpc
+               default "/opt/cross/x86_64-unknown-linux-gnu"   if x86_64
+
+       config TOOLCHAIN_BIN_PATH
+               string
+               prompt "Toolchain program path"  if DEVEL
+               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               default "./usr/bin ./bin"
+               help
+                 Specify additional directories searched for toolchain binaries (override PATH)
+                 Use ./DIR for directories relative to the root above
+
+       config TOOLCHAIN_INC_PATH
+               string
+               prompt "Toolchain include path"  if DEVEL
+               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               default "./usr/include ./include"
+               help
+                 Specify additional directories searched for header files (override CPPFLAGS)
+                 Use ./DIR for directories relative to the root above
+
+       config TOOLCHAIN_LIB_PATH
+               string
+               prompt "Toolchain library path"  if DEVEL
+               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               default "./usr/lib ./lib"
+               help
+                 Specify additional directories searched for libraries (override LDFLAGS)
+                 Use ./DIR for directories relative to the root above
+
+config NEED_TOOLCHAIN
+       bool
+       depends DEVEL
+       default y if !EXTERNAL_TOOLCHAIN
 
 menuconfig TOOLCHAINOPTS
-       bool "Toolchain Options" if DEVEL
-       depends !NATIVE_TOOLCHAIN
+       bool "Toolchain Options"  if DEVEL
+       depends NEED_TOOLCHAIN
 
 menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
+       depends !sparc
        default y       if powerpc64
        default n
        help
@@ -42,14 +119,24 @@ menuconfig EXTRA_TARGET_ARCH
                  both powerpc and powerpc64 binaries, you'll need to
                  specify -m64 here.
 
+comment "Binary tools"
+       depends TOOLCHAINOPTS
+
 source "toolchain/binutils/Config.in"
+
+comment "Compiler"
+       depends TOOLCHAINOPTS
+
 source "toolchain/gcc/Config.in"
 
+comment "C Library"
+       depends TOOLCHAINOPTS
+
 choice
-       prompt "LIBC implementation" if TOOLCHAINOPTS
+       prompt "C Library implementation" if TOOLCHAINOPTS
        default USE_UCLIBC
        help
-         Select the LIBC implementation.
+         Select the C library implementation.
 
        config USE_EGLIBC
                bool "Use eglibc"
@@ -68,6 +155,9 @@ source "toolchain/eglibc/Config.in"
 source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 
+comment "Debuggers"
+       depends TOOLCHAINOPTS
+
 config GDB
        bool
        prompt "Build gdb" if TOOLCHAINOPTS
@@ -107,8 +197,7 @@ config LIBC_VERSION
 
 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)