summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-19 14:17:34 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-19 14:17:34 +0000
commitf6c0fd635adba268e2c23c7a3aeb8734d31f8a58 (patch)
tree739116d335f2af0cfa935b5b9c515d1d1351c348 /toolchain
parentb796ecae8fb4b8b5cef5e5bb535a561e28d0c815 (diff)
- copy the _CONFIG_FILES back
- use the BUSYBOX_CONFIG_FILE if specified by the user
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/uclibc.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 2c83d66f2..8d26a7f74 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -86,7 +86,7 @@ endif
# Some targets may wish to provide their own UCLIBC_CONFIG_FILE...
$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE)
- cp $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
+ cp -f $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
$(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' \
@@ -224,6 +224,7 @@ uclibc-menuconfig: $(UCLIBC_DIR)/.config
RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
HOSTCC="$(HOSTCC)" \
menuconfig && \
+ cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \
touch $(UCLIBC_DIR)/.configured