build: do not deselect CONFIG_USE_SSTRIP if CONFIG_DEBUG is enabled

[openwrt/staging/wigyori.git] / config / Config-build.in

diff --git a/config/Config-build.in b/config/Config-build.in
index e2defaa9688c4f8aafbb109932c5573a5584115f..5ad940ba6c235cc222557003640c8a4136b8f2dd 100644 (file)
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -83,7 +83,7 @@ menu "Global build settings"
                prompt "Enable IPv6 support in packages"
                default y
                help
-                 Enable IPv6 support in packages (passes --enable-ipv6 to configure scripts).
+                 Enables IPv6 support in kernel (builtin) and packages.
 
        config PKG_BUILD_PARALLEL
                bool
@@ -143,7 +143,7 @@ menu "Global build settings"
        choice
                prompt "Binary stripping method"
                default USE_STRIP   if EXTERNAL_TOOLCHAIN
-               default USE_STRIP   if USE_GLIBC || USE_MUSL
+               default USE_STRIP   if USE_GLIBC
                default USE_SSTRIP
                help
                  Select the binary stripping method you wish to use.
@@ -152,7 +152,7 @@ menu "Global build settings"
                        bool "none"
                        help
                          This will install unstripped binaries (useful for native
-                         compiling/debugging).
+                         compiling/debugging).
 
                config USE_STRIP
                        bool "strip"
@@ -162,7 +162,6 @@ menu "Global build settings"
 
                config USE_SSTRIP
                        bool "sstrip"
-                       depends on !DEBUG
                        depends on !USE_GLIBC
                        help
                          This will install binaries stripped using sstrip.
@@ -232,7 +231,7 @@ menu "Global build settings"
                config PKG_CC_STACKPROTECTOR_STRONG
                        bool "Strong"
                        select SSP_SUPPORT if !USE_MUSL
-                       depends on GCC_VERSION_4_9_LINARO || GCC_VERSION_5
+                       depends on GCC_VERSION_5
                        depends on KERNEL_CC_STACKPROTECTOR_STRONG
        endchoice
 
@@ -247,7 +246,7 @@ menu "Global build settings"
                config KERNEL_CC_STACKPROTECTOR_REGULAR
                        bool "Regular"
                config KERNEL_CC_STACKPROTECTOR_STRONG
-                       depends on GCC_VERSION_4_9_LINARO || GCC_VERSION_5
+                       depends on GCC_VERSION_5
                        bool "Strong"
        endchoice