From 1870a35b0bcfc1b5ecb5d9318eb813a19c801179 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Mon, 13 Mar 2017 18:00:48 -0600
Subject: [PATCH] Include C++ library to 'make export'

---
 FlatLibs.mk      | 6 ++++++
 KernelLibs.mk    | 6 ++++++
 ProtectedLibs.mk | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/FlatLibs.mk b/FlatLibs.mk
index 69fe6a9fa0..0a05e84c49 100644
--- a/FlatLibs.mk
+++ b/FlatLibs.mk
@@ -118,6 +118,12 @@ ifeq ($(CONFIG_WIRELESS),y)
 NUTTXLIBS += lib$(DELIM)libwireless$(LIBEXT)
 endif
 
+# Add C++ library
+
+ifeq ($(CONFIG_HAVE_CXX),y)
+NUTTXLIBS += lib$(DELIM)libcxx$(LIBEXT)
+endif
+
 # Export all libraries
 
 EXPORTLIBS = $(NUTTXLIBS)
diff --git a/KernelLibs.mk b/KernelLibs.mk
index 719430b6c9..b1da6dbd0b 100644
--- a/KernelLibs.mk
+++ b/KernelLibs.mk
@@ -113,6 +113,12 @@ ifeq ($(CONFIG_WIRELESS),y)
 NUTTXLIBS += lib$(DELIM)libwireless$(LIBEXT)
 endif
 
+# Add C++ library
+
+ifeq ($(CONFIG_HAVE_CXX),y)
+NUTTXLIBS += lib$(DELIM)libcxx$(LIBEXT)
+endif
+
 # Export only the user libraries
 
 EXPORTLIBS = $(USERLIBS)
diff --git a/ProtectedLibs.mk b/ProtectedLibs.mk
index 4f2e2c6072..5dd45a6fab 100644
--- a/ProtectedLibs.mk
+++ b/ProtectedLibs.mk
@@ -123,6 +123,12 @@ ifeq ($(CONFIG_WIRELESS),y)
 NUTTXLIBS += lib$(DELIM)libwireless$(LIBEXT)
 endif
 
+# Add C++ library
+
+ifeq ($(CONFIG_HAVE_CXX),y)
+NUTTXLIBS += lib$(DELIM)libcxx$(LIBEXT)
+endif
+
 # Export only the user libraries
 
 EXPORTLIBS = $(USERLIBS)