X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=32de4b16473aa494cf9102eb251e8a0ddf18d720;hb=ff3f28265f2b963404c6705834eeddb93809c050;hp=cf08ae9caad33e6f76c5ff3d52feb180558204dd;hpb=47ac8caa622d58cf91938a7896b03298a7b05f1a;p=oweals%2Fopenwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index cf08ae9caa..32de4b1647 100644
--- 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
@@ -65,26 +142,26 @@ choice
 		bool "Use eglibc"
 		depends !avr32
 	
-	config USE_GLIBC
-		bool "Use glibc"
-		depends !avr32
-	
 	config USE_UCLIBC
 		bool "Use uClibc"
 
+	config USE_MUSL
+		bool "Use musl"
+
 endchoice
 
 source "toolchain/eglibc/Config.in"
-source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
+source "toolchain/musl/Config.in"
 
 comment "Debuggers"
 	depends TOOLCHAINOPTS
 
 config GDB
 	bool
+	depends !avr32
 	prompt "Build gdb" if TOOLCHAINOPTS
-	default n
+	default y
 	help
 		Enable if you want to build the gdb
 
@@ -98,30 +175,35 @@ config INSIGHT
 
 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/eglibc/Config.version"
-source "toolchain/glibc/Config.version"
 source "toolchain/uClibc/Config.version"
+source "toolchain/musl/Config.version"
 
 config LIBC
 	string
 	default "eglibc"  if USE_EGLIBC
-	default "glibc"   if USE_GLIBC
 	default "uClibc"  if USE_UCLIBC
+	default "musl"	  if USE_MUSL
 
 config LIBC_VERSION
 	string
 	default EGLIBC_VERSION  if USE_EGLIBC
-	default GLIBC_VERSION   if USE_GLIBC
 	default UCLIBC_VERSION  if USE_UCLIBC
+	default MUSL_VERSION	if USE_MUSL
 
 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 && (arm || armeb)
+	default "gnu"             if USE_EGLIBC && !(arm || armeb)
+	default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
+	default "uclibc"          if USE_UCLIBC && !(arm || armeb)
+	default "muslgnueabi"     if USE_MUSL && (arm || armeb)
+	default "musl"            if USE_MUSL && !(arm || armeb)