summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Config.in2
-rw-r--r--toolchain/uClibc/Makefile1
2 files changed, 2 insertions, 1 deletions
diff --git a/Config.in b/Config.in
index 901d74006..4e874a69d 100644
--- a/Config.in
+++ b/Config.in
@@ -145,7 +145,7 @@ menu "Global build settings"
bool "Compile with full language support"
help
When this option is enabled, packages are built with the full versions of iconv and GNU gettext
- instead of the default OpenWrt stubs.
+ instead of the default OpenWrt stubs. If uClibc is used, it is also built with locale support.
config SHADOW_PASSWORDS
bool
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 5f4ddb5d9..8c658448b 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -78,6 +78,7 @@ define Host/Prepare
-e 's,^.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n,y),g' \
-e 's,^.*UCLIBC_HAS_SOFT_FLOAT.*,UCLIBC_HAS_SOFT_FLOAT=$(if $(CONFIG_SOFT_FLOAT),y,n),g' \
-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
+ -e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
$(HOST_BUILD_DIR)/.config
$(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"