This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit f844db51942be35b5cbcfde0ba3077999c0d6b00
Author: Ville Juven <ville.ju...@unikie.com>
AuthorDate: Fri Oct 14 10:01:50 2022 +0300
libapps.a: Add the static application library always to the target libraries
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.
---
Application.mk | 8 +++-----
import/Make.defs | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Application.mk b/Application.mk
index a8f6b4523..37b6c82d5 100644
--- a/Application.mk
+++ b/Application.mk
@@ -42,11 +42,9 @@ else
CWD = $(CURDIR)
endif
-# Add the static application library to the linked libraries. Don't do this
-# with CONFIG_BUILD_KERNEL as there is no static app library
-ifneq ($(CONFIG_BUILD_KERNEL),y)
- LDLIBS += $(call CONVERT_PATH,$(BIN))
-endif
+# Add the static application library to the linked libraries.
+
+LDLIBS += $(call CONVERT_PATH,$(BIN))
# When building a module, link with the compiler runtime.
# This should be linked after libapps. Consider that mbedtls in libapps
diff --git a/import/Make.defs b/import/Make.defs
index ae055a93b..f3f935188 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -66,7 +66,7 @@ LDLIBPATH = $(addprefix -L,$(call
CONVERT_PATH,$(TOPDIR)$(DELIM)libs))
# Link with user libraries
ifeq ($(CONFIG_BUILD_KERNEL),y)
- LDLIBS = -lapps -lmm -lc -lproxies
+ LDLIBS += -lmm -lc -lproxies
ifeq ($(CONFIG_HAVE_CXX),y)
LDLIBS += -lxx
endif
