X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2FConfig.in;h=b53b8e63ec111697e0f6af45538e9efa84bf5a3f;hp=a6aa84db75a40f9cefd4db839326066c60140a26;hb=7263e3cdcaa2b30cf3b7fe4542a99e4f702032b2;hpb=fa69553900516944fc43cf7b377105ea1f6d3db0

diff --git a/toolchain/Config.in b/toolchain/Config.in
index a6aa84db75..b53b8e63ec 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -96,17 +96,38 @@ menuconfig EXTERNAL_TOOLCHAIN
 		default "/opt/cross/powerpc-unknown-linux-gnu"  if powerpc
 		default "/opt/cross/x86_64-unknown-linux-gnu"   if x86_64
 
-	config TOOLCHAIN_LIBC
-		string
+	choice TOOLCHAIN_LIBC_TYPE
 		prompt "Toolchain libc"  if DEVEL
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
-		default "uclibc"
+		default EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
 		help
 		  Specify the libc type used by the external toolchain. The given value
 		  is passed as -m flag to all gcc and g++ invocations. This is mainly
 		  intended for multilib toolchains which support glibc and uclibc at
 		  the same time. If no value is specified, no -m flag is passed.
 
+		config EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC
+			bool "glibc"
+			select USE_GLIBC
+
+		config EXTERNAL_TOOLCHAIN_LIBC_USE_UCLIBC
+			bool "uClibc"
+			select USE_UCLIBC
+			depends on !(aarch64 || aarch64_be)
+
+		config EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
+			bool "musl"
+			select USE_MUSL
+
+	endchoice
+
+	config TOOLCHAIN_LIBC
+		string
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "glibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC
+		default "uclibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_UCLIBC
+		default "musl" if EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
+
 	config TOOLCHAIN_BIN_PATH
 		string
 		prompt "Toolchain program path"  if DEVEL
@@ -206,6 +227,14 @@ comment "Compiler"
 
 source "toolchain/gcc/Config.in"
 
+config YASM
+	bool
+	depends on ( i386 || x86_64 )
+	prompt "Build yasm" if TOOLCHAINOPTS
+	default y
+	help
+	  Enable if you want to build yasm
+
 comment "C Library"
 	depends on TOOLCHAINOPTS
 
@@ -217,7 +246,7 @@ choice
 	  Select the C library implementation.
 
 	config LIBC_USE_GLIBC
-		bool "Use (e)glibc"
+		bool "Use glibc"
 		select USE_GLIBC
 		depends on !arc