OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Matias N 2020-09-11 22:31:38 -03:00 committed by Xiang Xiao
parent 93eeecff6a
commit 34b34e2d45
5 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/quickstart/install.rst
View File

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

12
README.md
View File

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

7
boards/Board.mk
View File

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

2
libs/libc/zoneinfo/Makefile
View File

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

16
tools/Config.mk
View File

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