You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/10/17 08:23:36 UTC
[incubator-nuttx] branch releases/10.0 updated: sim: Fix make export
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/releases/10.0 by this push:
new 6bdae1e sim: Fix make export
6bdae1e is described below
commit 6bdae1ededc2beb92483b86f38453c3348df4c7a
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Oct 8 08:28:46 2020 +0900
sim: Fix make export
Namely, don't forget to generate nuttx-names.dat.
---
arch/sim/src/Makefile | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index b731b52..aa99777 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -287,9 +287,11 @@ board/libboard$(LIBEXT):
# Step 3 cheat the host there is no object to construct
# Note: the destructor can be fixed in the same way.
-nuttx$(EXEEXT): libarch$(LIBEXT) board/libboard$(LIBEXT) $(LINKOBJS) $(HOSTOBJS)
- $(Q) echo "LD: nuttx$(EXEEXT)"
+nuttx-names.dat: nuttx-names.in
$(call PREPROCESS, nuttx-names.in, nuttx-names.dat)
+
+nuttx$(EXEEXT): libarch$(LIBEXT) board/libboard$(LIBEXT) $(LINKOBJS) $(HOSTOBJS) nuttx-names.dat
+ $(Q) echo "LD: nuttx$(EXEEXT)"
$(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o nuttx.rel $(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
$(Q) $(OBJCOPY) --redefine-syms=nuttx-names.dat nuttx.rel
$(Q) $(CC) $(CCLINKFLAGS) -Wl,-verbose 2>&1 | \
@@ -305,7 +307,7 @@ nuttx$(EXEEXT): libarch$(LIBEXT) board/libboard$(LIBEXT) $(LINKOBJS) $(HOSTOBJS)
# This is part of the top-level export target
-export_startup: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS)
+export_startup: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS) nuttx-names.dat
cp up_head.o $(HOSTOBJS) ${EXPORT_DIR}/startup
cp nuttx-names.dat ${EXPORT_DIR}/libs
echo main NXmain >> ${EXPORT_DIR}/libs/nuttx-names.dat