From c7865ddca3028f3e21fe22283aaa23654a4064f4 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 8 Oct 2020 08:28:46 +0900 Subject: [PATCH] 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 b731b52a8a..aa9977739b 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