summaryrefslogtreecommitdiff
path: root/mk/build.mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-12 13:50:42 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-12 13:50:42 +0100
commitd781e714f69e31469cc617c602f6c8d872ffb442 (patch)
tree027b133ecd69abc104dad94dbd85e67ec2891ac5 /mk/build.mk
parent6d7b7068c8fcf8fcf4721bf8ea2ec3cedfed94fc (diff)
break out of the loop on error, do not delete prereq.mk on clean
Diffstat (limited to 'mk/build.mk')
-rw-r--r--mk/build.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 64719b2df..352fde165 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; \