aboutsummaryrefslogtreecommitdiff
path: root/nuttx/libxx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-03 13:02:31 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-03 13:02:31 +0000
commit1336ed8637d05a59271077e48501e44ef6150463 (patch)
treea020ff768421c953e5bd2b4e1510e37561a296de /nuttx/libxx
parentdf77815b8b94d487809e1b2786bbe729de4bfbb8 (diff)
downloadpx4-firmware-1336ed8637d05a59271077e48501e44ef6150463.tar.gz
px4-firmware-1336ed8637d05a59271077e48501e44ef6150463.tar.bz2
px4-firmware-1336ed8637d05a59271077e48501e44ef6150463.zip
uClibc++ updates
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5302 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/libxx')
-rw-r--r--nuttx/libxx/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/nuttx/libxx/Makefile b/nuttx/libxx/Makefile
index e563b9647..a749269b0 100644
--- a/nuttx/libxx/Makefile
+++ b/nuttx/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