Merge remote-tracking branch 'toybox/master' into HEAD am: a379d5ee15 am: a4f4fa78eb...

[android-x86/external-toybox.git] / Config.in

diff --git a/Config.in b/Config.in
index 8fb1f13..5c4b5fe 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -77,6 +77,12 @@ config TOYBOX_LIBCRYPTO
        help
          Use faster hash functions out of exteral -lcrypto library.
 
+config TOYBOX_LIBZ
+       bool "Use libz (zlib)"
+       default n
+       help
+         Use libz for gz support.
+
 config TOYBOX_FLOAT
        bool "Floating point support"
        default y
@@ -135,6 +141,12 @@ config TOYBOX_DEBUG
          Enable extra checks for debugging purposes. All of them catch
          things that can only go wrong at development time, not runtime.
 
+config TOYBOX_PEDANTIC_ARGS
+       bool "Pedantic argument checking"
+       default n
+       help
+         Check arguments for commands that have no arguments.
+
 config TOYBOX_UID_SYS
        int "First system UID"
        default 100
@@ -157,19 +169,12 @@ config TOYBOX_MUSL_NOMMU_IS_BROKEN
          daemon() at compile time, musl intentionally includes broken versions
          that always return -ENOSYS on nommu systems, and goes out of its way
          to prevent any cross-compile compatible compile-time probes for a
-         nommu system.
+         nommu system. (It doesn't even #define __MUSL__ in features.h.)
 
          Musl does this despite the fact that a nommu system can't even run
          standard ELF binaries, and requires specially packaged executables.
-         (You can't even check a #define to see that you're building against
-         musl, due to its maintainer's policy that musl never has bugs that
-         require workarounds.)
-
          So our only choice is to manually provide a musl nommu bug workaround
          you can manually select to enable (larger, slower) nommu support with
          musl.
 
-         You don't need this for uClibc, we have a compile time probe that
-         autodetects nommu support there.
-
 endmenu