diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 17:13:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 17:13:10 +0100 |
| commit | b1e843d40eea9bc684436f4635018b7c19eb93ea (patch) | |
| tree | 47ad27e5a96c877418456383ee789e543ef4c708 | |
| parent | 5a7e9dd4c28b17e1a0320cbf296cec6475bf1b0d (diff) | |
fix armhf toolchain build
| -rw-r--r-- | mk/build.mk | 11 | ||||
| -rw-r--r-- | target/tarch.lst | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index e35f29d22..90168586a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -470,7 +470,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - if [ -z "$(LIBC)" ];then \ + @if [ -z "$(LIBC)" ];then \ libc="glibc uclibc musl"; \ else \ libc="$(LIBC)"; \ @@ -480,15 +480,18 @@ bulktoolchain: mkdir -p ${TOPDIR}/firmware; \ ( \ echo === building $$arch $$libc toolchain-$$arch on $$(date); \ - tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##"); \ if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \ - tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}*; \ + if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \ + tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ + if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ + tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz host_* target_$${arch}_$${libc}$${abi}; \ $(GMAKE) cleantoolchain; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}_build.log; \ + ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_build.log; \ if [ -f .exit ];then break;fi \ done <${TOPDIR}/target/tarch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ diff --git a/target/tarch.lst b/target/tarch.lst index e7251f8d2..09eed2265 100644 --- a/target/tarch.lst +++ b/target/tarch.lst @@ -1,10 +1,13 @@ arm +armhf m68k microblaze microblazeel mips mipsel mips64 +mips64n32 +mips64n64 mips64el ppc ppc64 |