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 2021/09/02 07:05:38 UTC
[incubator-nuttx] branch master updated: makefile: let
`clean_context` in `distclean` command
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 5c5975d makefile: let `clean_context` in `distclean` command
5c5975d is described below
commit 5c5975d8871a1a5db05fcefa7bdb47600033ca15
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Wed Sep 1 10:11:39 2021 +0800
makefile: let `clean_context` in `distclean` command
In multi-jobs build, `distclean` may be faster than `clean_context`,
Fix the case `distclean` use the dirctorys that have been
removed by `clean_context` in board/xtensa with xt-xcc
---
tools/Makefile.unix | 3 ++-
tools/Makefile.win | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index 3e0c9db..23eac19 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -568,10 +568,11 @@ $(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
subdir_distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
-distclean: clean subdir_distclean clean_context
+distclean: clean subdir_distclean
ifeq ($(CONFIG_BUILD_2PASS),y)
$(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) distclean
endif
+ $(Q) $(MAKE) clean_context
$(call DELFILE, Make.defs)
$(call DELFILE, defconfig)
$(call DELFILE, .config)
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 180f62d..a3b5f6d 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -517,10 +517,11 @@ $(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
subdir_distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
-distclean: clean subdir_distclean clean_context
+distclean: clean subdir_distclean
ifeq ($(CONFIG_BUILD_2PASS),y)
$(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) distclean
endif
+ $(Q) $(MAKE) clean_context
$(call DELFILE, Make.defs)
$(call DELFILE, defconfig)
$(call DELFILE, .config)