From d1bcd2977c34f952c11fb8a012832f0032f5b83d Mon Sep 17 00:00:00 2001
From: Ville Juven <ville.juven@unikie.com>
Date: Tue, 28 Dec 2021 13:18:38 +0200
Subject: [PATCH] Fix link error due to missing libapps.a in KERNEL build

The import target for kernel build now fails, due to setting libapps.a
as the default value for the BIN variable.

The fail happens when the ELFLD function passes the LDLIBS parameter
(which contains BIN / libapps.a) for the linker. There is no rule to
create libapps.a in the case of the kernel build, so the linker gives
an error due to it being missing.

This commit patches this behavior so that BIN is not appended to
LDLIBS. Another option would be to implement a dummy rule to create
libapps.a, but looking at the git history this is no longer wanted
behavior, thus the error is patched like this.
---
 Application.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Application.mk b/Application.mk
index d592d4dbd..a0371cb86 100644
--- a/Application.mk
+++ b/Application.mk
@@ -59,10 +59,14 @@ else
 CWD = $(CURDIR)
 endif
 
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  LDLIBS += "${shell cygpath -w $(BIN)}"
-else
-  LDLIBS += $(BIN)
+# 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)
+  ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
+    LDLIBS += "${shell cygpath -w $(BIN)}"
+  else
+    LDLIBS += $(BIN)
+  endif
 endif
 
 SUFFIX = $(subst $(DELIM),.,$(CWD))