summaryrefslogtreecommitdiff
path: root/toolchain/uClibc/uclibc.mk
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-10-02 18:52:14 +0000
committerEric Andersen <andersen@codepoet.org>2006-10-02 18:52:14 +0000
commitea85352bfb643e55b26a588f07f5920467d3c118 (patch)
tree0a915e972d1eb25f0a22ae825ab9ba654818164f /toolchain/uClibc/uclibc.mk
parent4c2a4485d16d9f2327c93f44621bc97deec9f08d (diff)
kill the separate 'uClibc.config-locale' file, which was generally left unmaintained
and instead just update the installed uClibc config file in place to enable locale when selected
Diffstat (limited to 'toolchain/uClibc/uclibc.mk')
-rw-r--r--toolchain/uClibc/uclibc.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 1b58ff3ad..fbc6cd770 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -5,12 +5,8 @@
#############################################################
ifndef UCLIBC_CONFIG_FILE
-ifeq ($(BR2_ENABLE_LOCALE),y)
-UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc.config-locale
-else
UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc.config
endif
-endif
ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
# Be aware that this changes daily....
@@ -70,6 +66,9 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
uclibc-configured: dependencies kernel-headers $(UCLIBC_DIR)/.configured
$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
cp $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
+ifeq ($(ENABLE_LOCALE),true)
+ $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=y\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.config
+endif
$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
-e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
-e 's,^TARGET_ARCH="none",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \