You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/05/26 07:39:44 UTC
[incubator-nuttx] branch master updated: build: exit normaly once
catch 'make depend' and 'make context' failure case
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 56e7a90 build: exit normaly once catch 'make depend' and 'make context' failure case
56e7a90 is described below
commit 56e7a906e5dba2c6cba724828c5a538df0672226
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Tue May 26 11:37:15 2020 +0800
build: exit normaly once catch 'make depend' and 'make context' failure case
To be strict in check build, once any 'make depend' or 'make context' fails, exit normally.
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
tools/Makefile.unix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index ca2d1b5..8a31b90 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -332,7 +332,7 @@ dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(
context: include/nuttx/config.h include/nuttx/version.h include/math.h include/float.h include/stdarg.h include/setjmp.h dirlinks
$(Q) mkdir -p staging
$(Q) for dir in $(CONTEXTDIRS) ; do \
- $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" context; \
+ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" context || exit; \
done
# clean_context
@@ -437,12 +437,12 @@ download: $(BIN)
pass1dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
$(Q) for dir in $(USERDEPDIRS) ; do \
- $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \
+ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend || exit; \
done
pass2dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
$(Q) for dir in $(KERNDEPDIRS) ; do \
- $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" depend; \
+ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)" depend || exit; \
done
# Configuration targets