diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:56:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:56:43 +0100 |
| commit | 69cdc46a87653bdab1514564598bf6d694556a4f (patch) | |
| tree | a05da1e3c0c00711559a25b8b7917b3cce464147 /mk | |
| parent | d6d4d15f6553e758ef6adca22d48210524f39a83 (diff) | |
| parent | fdc973fa4e29cada901b9499160a0478b59cefea (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 12 | ||||
| -rw-r--r-- | mk/mirrors.mk | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mk/build.mk b/mk/build.mk index 64719b2df..fd1d12c11 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -272,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 @@ -500,7 +499,7 @@ bulktoolchain: 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; \ + $(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; \ @@ -621,6 +620,7 @@ package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TO @:>.menu $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c + @mkdir -p host_$(GNU_HOST_NAME)/usr/bin $(CC_FOR_BUILD) -g -o $@ $(TOPDIR)/tools/adk/depmaker.c dep: $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker diff --git a/mk/mirrors.mk b/mk/mirrors.mk index 43bc1a6f4..4de2fdded 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -42,6 +42,8 @@ MASTER_SITE_GNU?= \ ftp://ftp.sunet.se/pub/gnu/ \ MASTER_SITE_SOURCEFORGE?= \ + http://skylink.dl.sourceforge.net/sourceforge/ \ + http://garr.dl.sourceforge.net/sourceforge/ \ http://heanet.dl.sourceforge.net/sourceforge/ \ http://jaist.dl.sourceforge.net/sourceforge/ \ http://nchc.dl.sourceforge.net/sourceforge/ \ |