[incubator-nuttx-apps] branch master updated: BUILD_KERNEL: Include CPP libraries only if configured to do so

[xi...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new c1453b5  BUILD_KERNEL: Include CPP libraries only if configured to do so
c1453b5 is described below

commit c1453b589d284f914bbfefe3426b5d0f9f184440
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Wed Feb 23 12:32:51 2022 +0200

    BUILD_KERNEL: Include CPP libraries only if configured to do so
    
    Otherwise build without HAVE_CXX flag fails
---
 import/Make.defs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/import/Make.defs b/import/Make.defs
index 3d100f7..e5b0ed1 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -66,7 +66,10 @@ LDLIBPATH = $(addprefix -L,$(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs))
 # Link with user libraries
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-  LDLIBS = -lapps -lxx -lmm -lc -lproxies
+  LDLIBS = -lapps -lmm -lc -lproxies
+  ifeq ($(CONFIG_HAVE_CXX),y)
+    LDLIBS += -lxx
+  endif
 ifneq ($(CONFIG_LIBM),y)
   LIBM = ${shell "$(CC)" $(ARCHCPUFLAGS) --print-file-name=libm.a}
 ifneq ($(LIBM),".")