sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libapps.a: Add the static application library always to the target libraries

Browse Source 
This error was made by me a long time ago, not understanding how the kernel
mode build is expected to work. So partially revert PR#946.
This commit is contained in:
Ville Juven 2022-10-14 10:01:50 +03:00 committed by Xiang Xiao
parent bca94fce5a
commit f844db5194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Application.mk
View File

@ -42,11 +42,9 @@ else
CWD = $(CURDIR) CWD = $(CURDIR)
endif endif
# Add the static application library to the linked libraries. Don't do this # Add the static application library to the linked libraries.
# with CONFIG_BUILD_KERNEL as there is no static app library
ifneq ($(CONFIG_BUILD_KERNEL),y) LDLIBS += $(call CONVERT_PATH,$(BIN))
LDLIBS += $(call CONVERT_PATH,$(BIN))
endif
# When building a module, link with the compiler runtime. # When building a module, link with the compiler runtime.
# This should be linked after libapps. Consider that mbedtls in libapps # This should be linked after libapps. Consider that mbedtls in libapps

2
import/Make.defs
View File

@ -66,7 +66,7 @@ LDLIBPATH = $(addprefix -L,$(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs))
# Link with user libraries # Link with user libraries
ifeq ($(CONFIG_BUILD_KERNEL),y) ifeq ($(CONFIG_BUILD_KERNEL),y)
LDLIBS = -lapps -lmm -lc -lproxies LDLIBS += -lmm -lc -lproxies
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
LDLIBS += -lxx LDLIBS += -lxx
endif endif