summaryrefslogtreecommitdiff
path: root/nuttx/libxx/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-09 14:54:29 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-09 14:54:29 +0000
commit42a56e78dda5561d301ec2e61a0bac17e7342525 (patch)
tree5dec10051ddb12ddf1d6d7f02c69d09ad2a27895 /nuttx/libxx/Makefile
parent2b35c03044dc6acfe720522f943ee07df1b65897 (diff)
downloadpx4-nuttx-42a56e78dda5561d301ec2e61a0bac17e7342525.tar.gz
px4-nuttx-42a56e78dda5561d301ec2e61a0bac17e7342525.tar.bz2
px4-nuttx-42a56e78dda5561d301ec2e61a0bac17e7342525.zip
Several patches from Petteri Aimonen (mostly NxWidgets)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5324 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/libxx/Makefile')
-rw-r--r--nuttx/libxx/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/nuttx/libxx/Makefile b/nuttx/libxx/Makefile
index a749269b0..584af4e96 100644
--- a/nuttx/libxx/Makefile
+++ b/nuttx/libxx/Makefile
@@ -46,7 +46,12 @@ CXXSRCS = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx libxx_cxa_atexit.cxx
# uClibx++ replaces them
ifneq ($(CONFIG_UCLIBCXX),y)
-CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx
+CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx
+CXXSRCS += libxx_stdthrow.cxx
+else
+ifneq ($(UCLIBCXX_EXCEPTION),y)
+CXXSRCS += libxx_stdthrow.cxx
+endif
endif
# Paths