diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:42:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:42:20 +0100 |
| commit | fdc973fa4e29cada901b9499160a0478b59cefea (patch) | |
| tree | 4fd9d8666d4d788c0ae4afe3086cd68e917b67b5 /mk/build.mk | |
| parent | 7aaac91a674b427e42e38cc6b86ada72fdc5e417 (diff) | |
| parent | 9cbc124a64439c1ac24a62ceed63efaf55e5760a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/build.mk')
| -rw-r--r-- | mk/build.mk | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/mk/build.mk b/mk/build.mk index 5c7ab4e31..fd1d12c11 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -39,6 +39,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ + ADK_PKG_CONSOLE=n \ + ADK_PKG_TEST=n \ ADK_TOOLCHAIN_GCC_USE_SSP=n \ ADK_TOOLCHAIN_GCC_USE_LTO=n \ BUSYBOX_IFPLUGD=n \ @@ -270,12 +272,11 @@ cleandir: cleantoolchain: @$(TRACE) cleantoolchain - @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) - rm -rf $(BUILD_DIR_PFX) $(TARGET_DIR_PFX) \ + @rm -rf $(BUILD_DIR_PFX) $(TARGET_DIR_PFX) \ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d - rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) - rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk + @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) + @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) + @rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk cleantarget: @$(TRACE) cleantarget @@ -484,26 +485,37 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - for libc in glibc uclibc musl;do \ + if [ -z "$(LIBC)" ];then \ + libc="glibc uclibc musl"; \ + else \ + libc="$(LIBC)"; \ + fi; \ + for libc in $$libc;do \ while read arch; do \ - mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \ + 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#"); \ + 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;fi; \ - tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}_*; \ + $(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}*; \ $(GMAKE) cleantoolchain; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \ + ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}_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 \ done test-framework: - for libc in uclibc glibc musl;do \ + if [ -z "$(LIBC)" ];then \ + libc="glibc uclibc musl"; \ + else \ + libc="$(LIBC)"; \ + fi; \ + for libc in $$libc;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ for arch in arm microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \ |