[incubator-nuttx] branch master updated: Fix: ensure archive files do not carry object files from prior builds

[xi...@apache.org]

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 34b34e2  Fix: ensure archive files do not carry object files from prior builds
34b34e2 is described below

commit 34b34e2d4519956f9a61f5985aca29947c4b8b23
Author: Matias N <ma...@protobits.dev>
AuthorDate: Fri Sep 11 22:31:38 2020 -0300

    Fix: ensure archive files do not carry object files from prior builds
    
    In some cases, when NuttX configuration changes and this makes the
    object list used to build one of the .a libraries change as well,
    since the command used to build it is "ar crs" and this simply appends
    the list of object files, the library could still include object
    files from prior builds. This commit modifies the ARCHIVE macro to
    erase the .a file if it already exists.
    
    Since in some cases this behavior was actually expected (object
    files from a subdirectory were appended to a library created one
    level above) I added a ARCHIVE_ADD which works as ARCHIVE did.
    
    This change should greatly improve behavior of building after
    configuration changes.
---
 Documentation/quickstart/install.rst |  2 --
 README.md                            | 12 ++----------
 boards/Board.mk                      |  7 +------
 libs/libc/zoneinfo/Makefile          |  2 +-
 tools/Config.mk                      | 16 +++++++++++++---
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Documentation/quickstart/install.rst b/Documentation/quickstart/install.rst
index 71cdfa6..d7265e6 100644
--- a/Documentation/quickstart/install.rst
+++ b/Documentation/quickstart/install.rst
@@ -39,8 +39,6 @@ Prerequisites
 
     .. code-block:: console
 
-      $ brew tap discoteq/discoteq
-      $ brew install flock
       $ brew install x86_64-elf-gcc  # Used by simulator
       $ brew install u-boot-tools  # Some platform integrate with u-boot
 
diff --git a/README.md b/README.md
index 92cab4c..4d87046 100644
--- a/README.md
+++ b/README.md
@@ -525,16 +525,8 @@ framework like GTK or Qt.  So this might be a trip down the rabbit hole.
 
 ### Using macOS
 
-You need to install at least the following tools specific to macOS.
-
-  * flock (used by APPDIR build logic)
-
-A macOS port is available at: <https://github.com/discoteq/flock>
-
-    brew tap discoteq/discoteq
-    brew install flock
-
-  If you want to build the sim:
+You need to install at least the following tools specific to macOS
+if you want to build the sim:
 
   * Xcode (the native compiler and the rest of the toolchain)
 
diff --git a/boards/Board.mk b/boards/Board.mk
index 7e642d2..29ebe29 100644
--- a/boards/Board.mk
+++ b/boards/Board.mk
@@ -105,12 +105,7 @@ $(CXXOBJS) $(LINKOBJS): %$(OBJEXT): %.cxx
 	$(call COMPILEXX, $<, $@)
 
 libboard$(LIBEXT): $(OBJS) $(CXXOBJS)
-ifneq ($(OBJS),)
-	$(call ARCHIVE, $@, $(OBJS))
-endif
-ifneq ($(CXXOBJS),)
-	$(call ARCHIVE, $@, $(CXXOBJS))
-endif
+	$(call ARCHIVE, $@, $(OBJS) $(CXXOBJS))
 
 .depend: Makefile $(SRCS) $(CXXSRCS) $(RCSRCS) $(TOPDIR)$(DELIM).config
 ifneq ($(ZDSVERSION),)
diff --git a/libs/libc/zoneinfo/Makefile b/libs/libc/zoneinfo/Makefile
index 919fdab..d6e6636 100644
--- a/libs/libc/zoneinfo/Makefile
+++ b/libs/libc/zoneinfo/Makefile
@@ -61,7 +61,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)
 
 .built: .tzbuilt romfs $(OBJS)
-	$(call ARCHIVE, ..$(DELIM)$(BIN), $(OBJS))
+	$(call ARCHIVE_ADD, ..$(DELIM)$(BIN), $(OBJS))
 	$(Q) touch .built
 
 # ROMFS file system containing the TZ database
diff --git a/tools/Config.mk b/tools/Config.mk
index eea069a..c04d4e1 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -300,8 +300,8 @@ define INSTALL_LIB
 	$(Q) install -m 0644 $1 $2
 endef
 
-# ARCHIVE - Add a list of files to an archive
-# Example: $(call ARCHIVE, archive-file, "file1 file2 file3 ...")
+# ARCHIVE_ADD - Add a list of files to an archive
+# Example: $(call ARCHIVE_ADD, archive-file, "file1 file2 file3 ...")
 #
 # Note: The fileN strings may not contain spaces or  characters that may be
 # interpreted strangely by the shell
@@ -316,8 +316,18 @@ endef
 #
 #   CONFIG_WINDOWS_NATIVE - Defined for a Windows native build
 
+define ARCHIVE_ADD
+	@echo "AR (add): $(notdir $1) $(2)"
+	$(Q) $(AR) $1 $(2)
+endef
+
+# ARCHIVE - Same as above, but ensure the archive is
+# created from scratch
+
 define ARCHIVE
-	$(AR) $1 $(2)
+	@echo "AR (create): $(notdir $1) $(2)"
+	$(Q) $(RM) $1
+	$(Q) $(AR) $1 $(2)
 endef
 
 # PRELINK - Prelink a list of files