From 5630a52bb44d7c53381986e7a0c2d7efa696eac3 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 3 Nov 2012 13:02:31 +0000
Subject: [PATCH] uClibc++ updates

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5302 42af7a65-404d-4744-a932-0658087f49c3
---
 libxx/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libxx/Makefile b/libxx/Makefile
index e563b9647ee..a749269b092 100644
--- a/libxx/Makefile
+++ b/libxx/Makefile
@@ -40,9 +40,14 @@
 ASRCS = 
 CSRCS = 
 
-CXXSRCS  = libxx_cxapurevirtual.cxx libxx_delete.cxx libxx_deletea.cxx
-CXXSRCS += libxx_eabi_atexit.cxx  libxx_cxa_atexit.cxx libxx_new.cxx
-CXXSRCS += libxx_newa.cxx 
+CXXSRCS  = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx  libxx_cxa_atexit.cxx
+
+# Some of the libxx/ files are not need if uClibc++ is installed because
+# uClibx++ replaces them
+
+ifneq ($(CONFIG_UCLIBCXX),y)
+CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx 
+endif
 
 # Paths