You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/01/21 14:36:22 UTC
[incubator-nuttx] branch pr141 updated: make/distclean: unlink the
dir after subdir clean
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr141
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/pr141 by this push:
new ada9937 make/distclean: unlink the dir after subdir clean
ada9937 is described below
commit ada9937ecb906c7d5ca1b1f1f51af6ffb6454a6f
Author: chao.an <an...@xiaomi.com>
AuthorDate: Tue Jan 21 15:51:05 2020 +0800
make/distclean: unlink the dir after subdir clean
Ensure the linked dir can be clean complete in multi-job case
Change-Id: Ie8c0b29ece1f727fd93f2e640c3f1cc7876a358b
Signed-off-by: chao.an <an...@xiaomi.com>
---
tools/Makefile.unix | 14 +++++++-------
tools/Makefile.win | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index b99b877..917ea0d 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -406,13 +406,6 @@ clean_context:
$(call DELFILE, include/math.h)
$(call DELFILE, include/stdarg.h)
$(call DELFILE, include/setjmp.h)
- $(Q) $(DIRUNLINK) include/arch/board
- $(Q) $(DIRUNLINK) include/arch/chip
- $(Q) $(DIRUNLINK) include/arch
- $(Q) $(DIRUNLINK) $(ARCH_SRC)/board/board
- $(Q) $(DIRUNLINK) $(ARCH_SRC)/board
- $(Q) $(DIRUNLINK) $(ARCH_SRC)/chip
- $(Q) $(DIRUNLINK) $(TOPDIR)/drivers/platform
# check_context
#
@@ -668,6 +661,13 @@ endif
$(call DELFILE, .config)
$(call DELFILE, .config.old)
$(call DELFILE, .gdbinit)
+ $(Q) $(DIRUNLINK) include/arch/board
+ $(Q) $(DIRUNLINK) include/arch/chip
+ $(Q) $(DIRUNLINK) include/arch
+ $(Q) $(DIRUNLINK) $(ARCH_SRC)/board/board
+ $(Q) $(DIRUNLINK) $(ARCH_SRC)/board
+ $(Q) $(DIRUNLINK) $(ARCH_SRC)/chip
+ $(Q) $(DIRUNLINK) $(TOPDIR)/drivers/platform
# Application housekeeping targets. The APPDIR variable refers to the user
# application directory. A sample apps/ directory is included with NuttX,
diff --git a/tools/Makefile.win b/tools/Makefile.win
index aee011c..6ef5bdc 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -424,13 +424,6 @@ clean_context:
$(call DELFILE, include\math.h)
$(call DELFILE, include\stdarg.h)
$(call DELFILE, include\setjmp.h)
- $(call DELDIR, include\arch\board)
- $(call DELDIR, include\arch\chip)
- $(call DELDIR, include\arch)
- $(call DELDIR, $(ARCH_SRC)\board\board)
- $(call DELDIR, $(ARCH_SRC)\board)
- $(call DELDIR, $(ARCH_SRC)\chip)
- $(call DELDIR, $(TOPDIR)\drivers\platform)
# check_context
#
@@ -645,6 +638,13 @@ endif
$(call DELFILE, Make.defs)
$(call DELFILE, .config)
$(call DELFILE, .config.old)
+ $(call DELDIR, include\arch\board)
+ $(call DELDIR, include\arch\chip)
+ $(call DELDIR, include\arch)
+ $(call DELDIR, $(ARCH_SRC)\board\board)
+ $(call DELDIR, $(ARCH_SRC)\board)
+ $(call DELDIR, $(ARCH_SRC)\chip)
+ $(call DELDIR, $(TOPDIR)\drivers\platform)
# Application housekeeping targets. The APPDIR variable refers to the user
# application directory. A sample apps\ directory is included with NuttX,