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.git
commit f2fe51c22dd108d8139cd310bd8f34722f8471a3 Author: zhuyanlin <[email protected]> AuthorDate: Thu Aug 19 17:13:43 2021 +0800 libc:libcxx: add support for libcxxabi. libcxxabi is either-or select with glibcxx. Change-Id: I4fbea19f0648ddc318379dd43bac8406f7c86927 --- libs/libxx/libcxx.defs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs index 9ade657..e12e24a 100644 --- a/libs/libxx/libcxx.defs +++ b/libs/libxx/libcxx.defs @@ -40,9 +40,15 @@ distclean:: $(Q) $(DIRUNLINK) $(TOPDIR)/include/libcxx $(call DELDIR, libcxx) -CXXFLAGS += ${shell $(DEFINE) "$(CC)" __GLIBCXX__} CXXFLAGS += ${shell $(DEFINE) "$(CC)" _LIBCPP_BUILDING_LIBRARY} +ifeq ($(CONFIG_LIBCXXABI), y) +CXXFLAGS += ${shell $(DEFINE) "$(CC)" LIBCXX_BUILDING_LIBCXXABI} +CXXFLAGS += -I $(TOPDIR)/libs/libxx/libcxxabi/include +else +CXXFLAGS += ${shell $(DEFINE) "$(CC)" __GLIBCXX__} +endif + # Workaround the following warning with "c++ (Ubuntu 9.3.0-10ubuntu2) 9.3.0" # # libcxx/src/barrier.cpp: In constructor 'std::__1::__barrier_algorithm_base::__barrier_algorithm_base(ptrdiff_t&)':
