From f292b67dce0a9b8e2974b607ca16a01fed1b7a5f Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 8 Mar 2021 19:32:41 -0800 Subject: [PATCH] arch/sim: Remove DRVLIB and reuse STDLIBS instead Change-Id: I5f79eca9039a296eca705d25b3541199a7fbaf9e Signed-off-by: Xiang Xiao --- arch/sim/src/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index b83540bc992..40f66b30b29 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -204,7 +204,7 @@ ifeq ($(CONFIG_SIM_NET_HOST_ROUTE),y) endif else # HOSTOS != Cygwin HOSTSRCS += up_wpcap.c - DRVLIB = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a + STDLIBS = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a endif # HOSTOS != Cygwin else ifeq ($(CONFIG_SIM_NETDEV_VPNKIT),y) CSRCS += up_netdriver.c @@ -338,8 +338,8 @@ nuttx$(EXEEXT): libarch$(LIBEXT) board/libboard$(LIBEXT) $(LINKOBJS) $(HOSTOBJS) -e 's/__init_array_end/_einit/g' -e 's/__fini_array_start/_sfini/g' -e 's/__fini_array_end/_efini/g' >nuttx.ld $(Q) echo "__init_array_start = .; __init_array_end = .; __fini_array_start = .; __fini_array_end = .;" >>nuttx.ld $(if $(CONFIG_HAVE_CXX),\ - $(Q) "$(CXX)" $(CCLINKFLAGS) $(LIBPATHS) $(ARCHSCRIPT) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS),\ - $(Q) "$(CC)" $(CCLINKFLAGS) $(LIBPATHS) $(ARCHSCRIPT) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS)) + $(Q) "$(CXX)" $(CCLINKFLAGS) $(LIBPATHS) $(ARCHSCRIPT) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(STDLIBS),\ + $(Q) "$(CC)" $(CCLINKFLAGS) $(LIBPATHS) $(ARCHSCRIPT) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(STDLIBS)) $(Q) $(NM) $(TOPDIR)/$@ | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ sort > $(TOPDIR)/System.map