summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-30 10:06:29 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-30 13:09:14 (GMT)
commit5266a0a75cb98dc2dec0ced894fbff70d36b26ab (patch)
treed0e0b0e418e26191aca30fb06a0c7bbe516f32a7 /mk
parent5a43da1af12df3a39cd30b724bf9144850bd2764 (diff)
use CLIB instead of LIBC to avoid clashes with uClibc buildsystem
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk28
1 files changed, 14 insertions, 14 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 6d4f8a4..bc1ce47 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -361,9 +361,9 @@ endif
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(TOPDIR)/.defconfig; \
fi
- @if [ ! -z "$(LIBC)" ];then \
+ @if [ ! -z "$(CLIB)" ];then \
grep "^config" target/config/Config.in \
- |grep -i "$(LIBC)" \
+ |grep -i "$(CLIB)" \
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(TOPDIR)/.defconfig; \
fi
@@ -419,9 +419,9 @@ endif
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(TOPDIR)/all.config; \
fi
- @if [ ! -z "$(LIBC)" ];then \
+ @if [ ! -z "$(CLIB)" ];then \
grep "^config" target/config/Config.in \
- |grep -i "$(LIBC)" \
+ |grep -i "$(CLIB)" \
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(TOPDIR)/all.config; \
fi
@@ -466,10 +466,10 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
# build all target architecture and libc combinations (toolchain only)
bulktoolchain:
- @if [ -z "$(LIBC)" ];then \
+ @if [ -z "$(CLIB)" ];then \
libc="glibc uclibc musl"; \
else \
- libc="$(LIBC)"; \
+ libc="$(CLIB)"; \
fi; \
for libc in $$libc;do \
while read arch; do \
@@ -478,7 +478,7 @@ bulktoolchain:
tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \
carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \
echo === building $$tarch $$libc toolchain-$$arch on $$(date); \
- $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
+ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch CLIB=$$libc defconfig; \
tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
@@ -494,10 +494,10 @@ bulktoolchain:
done
test-framework:
- @if [ -z "$(LIBC)" ];then \
+ @if [ -z "$(CLIB)" ];then \
libc="glibc uclibc musl"; \
else \
- libc="$(LIBC)"; \
+ libc="$(CLIB)"; \
fi; \
for libc in $$libc;do \
( \
@@ -506,7 +506,7 @@ test-framework:
tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##" -e "s#x86_64.*#x86_64#"); \
arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
- $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
+ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch CLIB=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
@@ -529,7 +529,7 @@ release:
( \
echo === building $$libc on $$(date); \
$(GMAKE) prereq && \
- $(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \
+ $(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) CLIB=$$libc FS=archive allmodconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
rm .config; \
) 2>&1 | tee $(TOPDIR)/firmware/release-build.log; \
@@ -547,7 +547,7 @@ bulk:
( \
echo === building $$arch $$system $$libc on $$(date); \
$(GMAKE) prereq && \
- $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
+ $(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive defconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
rm .config; \
) 2>&1 | tee $(TOPDIR)/firmware/bulkbuild.log; \
@@ -567,7 +567,7 @@ bulkall:
( \
echo === building $$arch $$system $$libc on $$(date); \
$(GMAKE) prereq && \
- $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \
+ $(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
rm .config; \
) 2>&1 | tee $(TOPDIR)/firmware/bulkallbuild.log; \
@@ -587,7 +587,7 @@ bulkallmod:
( \
echo === building $$arch $$system $$libc on $$(date); \
$(GMAKE) prereq && \
- $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
+ $(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allmodconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
$(GMAKE) clean; \
rm .config; \