summaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-12-14 02:50:58 +0000
committerEric Andersen <andersen@codepoet.org>2006-12-14 02:50:58 +0000
commita49677e0b921c761c0583b44a8619a5f96b185a4 (patch)
treeb64ddf3ed7ccdc6a5bf6d9290c5827cad4bcd846 /toolchain
parent70d474dd49ed9856080570863cf11a102b6e839c (diff)
downloadbuildroot-novena-a49677e0b921c761c0583b44a8619a5f96b185a4.tar.gz
buildroot-novena-a49677e0b921c761c0583b44a8619a5f96b185a4.zip
don't error out when asm-generic is absent
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/uclibc.mk18
1 files changed, 12 insertions, 6 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index b42bc861d..82677a1b5 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -178,8 +178,10 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config
if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \
cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
- [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] && \
- cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
+ if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
+ cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \
+ $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
+ fi; \
fi;
touch $(UCLIBC_DIR)/.configured
@@ -212,8 +214,10 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \
cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(STAGING_DIR)/include/ ; \
cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(STAGING_DIR)/include/ ; \
- [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] && \
- cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic $(STAGING_DIR)/include/ ; \
+ if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
+ cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \
+ $(STAGING_DIR)/include/ ; \
+ fi; \
fi;
# Build the host utils. Need to add an install target...
$(MAKE1) -C $(UCLIBC_DIR)/utils \
@@ -280,8 +284,10 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a
if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; then \
cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TARGET_DIR)/usr/include/ ; \
cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TARGET_DIR)/usr/include/ ; \
- [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] && \
- cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic $(TARGET_DIR)/usr/include/ ; \
+ if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
+ cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \
+ $(TARGET_DIR)/usr/include/ ; \
+ fi; \
fi;
touch -c $(TARGET_DIR)/usr/lib/libc.a