This is an automated email from the ASF dual-hosted git repository. gnutt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 698f0edbaa85a6d9ba886b610d88a9b2e7a47dd0 Author: YAMAMOTO Takashi <[email protected]> AuthorDate: Fri Feb 21 14:08:40 2020 +0900 Revert "build: Use flock to serialize ar steps as workaround" This reverts commit 6707bfae86aff8a3bae74f6bbafaca54d1315480. --- .gitignore | 1 - Application.mk | 4 ++-- Make.defs | 6 +----- Makefile | 5 ++--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6686305..722303b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.arlock .depend Make.dep *.o diff --git a/Application.mk b/Application.mk index 641e89b..25af192 100644 --- a/Application.mk +++ b/Application.mk @@ -130,9 +130,9 @@ $(CXXOBJS): %$(SUFFIX)$(OBJEXT): %$(CXXEXT) .built: $(OBJS) ifeq ($(WINTOOL),y) - $(call ARLOCK, "${shell cygpath -w $(BIN)}", $(OBJS)) + $(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(OBJS)) else - $(call ARLOCK, $(BIN), $(OBJS)) + $(call ARCHIVE, $(BIN), $(OBJS)) endif $(Q) touch $@ diff --git a/Make.defs b/Make.defs index 89a649b..77b0c82 100644 --- a/Make.defs +++ b/Make.defs @@ -52,7 +52,7 @@ CLEANDIRS := $(dir $(wildcard $(APPDIR)$(DELIM)*$(DELIM)Makefile)) CONFIGURED_APPS := define Add_Application - include $(1)Make.defs + include $(1)Make.defs endef $(foreach BDIR, $(BUILDIRS), $(eval $(call Add_Application,$(BDIR)))) @@ -99,10 +99,6 @@ define REGISTER endef endif -define ARLOCK - $(Q) flock .arlock $(call ARCHIVE, $1, $(2)) -endef - # Tools ifeq ($(DIRLINK),) diff --git a/Makefile b/Makefile index dfb9da8..e0ad31f 100644 --- a/Makefile +++ b/Makefile @@ -117,9 +117,9 @@ $(SYMTABOBJ): %$(OBJEXT): %.c $(BIN): $(SYMTABOBJ) ifeq ($(WINTOOL),y) - $(call ARLOCK, "${shell cygpath -w $(BIN)}", $^) + $(call ARCHIVE, "${shell cygpath -w $(BIN)}", $^) else - $(call ARLOCK, $(BIN), $^) + $(call ARCHIVE, $(BIN), $^) endif endif # !CONFIG_BUILD_LOADABLE @@ -198,7 +198,6 @@ else fi; \ ) endif - $(call DELFILE, .arlock) $(call DELFILE, .depend) $(call DELFILE, $(SYMTABSRC)) $(call DELFILE, $(SYMTABOBJ))
