Revert "build: Use flock to serialize ar steps as workaround"

This reverts commit 6707bfae86aff8a3bae74f6bbafaca54d1315480.
This commit is contained in:
YAMAMOTO Takashi 2020-02-21 14:08:40 +09:00 committed by patacongo
parent 10c715d921
commit 698f0edbaa
4 changed files with 5 additions and 11 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
.arlock
.depend
Make.dep
*.o

View File

@ -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 $@

View File

@ -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),)

View File

@ -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))