config: enable shadow passwords unconditionally

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

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 1eb99e362a046f2832322a5c39acb85859db2e14..75dc5361a6829621030f710f497451b33a1aa1ec 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -42,7 +42,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        bool
        prompt "Use external toolchain"  if DEVEL
        help
-         If enabled, OpenWrt will compile using an existing toolchain instead of
+         If enabled, LEDE will compile using an existing toolchain instead of
          compiling one.
 
        config NATIVE_TOOLCHAIN
@@ -51,7 +51,7 @@ menuconfig EXTERNAL_TOOLCHAIN
                depends on EXTERNAL_TOOLCHAIN
                select NO_STRIP
                help
-                 If enabled, OpenWrt will compile using the native toolchain for your
+                 If enabled, LEDE will compile using the native toolchain for your
                  host instead of compiling one.
 
        config TARGET_NAME
@@ -188,6 +188,7 @@ menuconfig EXTRA_TARGET_ARCH
                        bool "n64"
 
                config MIPS64_ABI_N32
+                       depends on !LIBC_USE_MUSL
                        bool "n32"
 
                config MIPS64_ABI_O32
@@ -205,19 +206,26 @@ 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
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
-       default LIBC_USE_GLIBC if mips64 || mips64el
        default LIBC_USE_UCLIBC if arc
        default LIBC_USE_MUSL
        help
          Select the C library implementation.
 
        config LIBC_USE_GLIBC
-               bool "Use (e)glibc"
+               bool "Use glibc"
                select USE_GLIBC
                depends on !arc
 
@@ -230,7 +238,7 @@ choice
        config LIBC_USE_MUSL
                select USE_MUSL
                bool "Use musl"
-               depends on !(arc || mips64 || mips64el)
+               depends on !(arc)
 
 endchoice
 
@@ -260,11 +268,11 @@ config USE_GLIBC
        bool
 
 config USE_UCLIBC
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc || mips64 || mips64el)
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
        bool
 
 config USE_MUSL
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc || mips64 || mips64el)
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc)
        bool
 
 config USE_EXTERNAL_LIBC