sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libxx: Move libcxxabi special setting from libcxx.defs to libcxxabi.defs

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-08-30 12:09:08 +08:00 committed by Abdelatif Guettouche
parent 397d329966
commit ce73f9cbfc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/libxx/libcxx.defs
View File

@ -43,10 +43,7 @@ distclean::
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
ifeq ($(CONFIG_LIBSUPCXX), y)
CXXFLAGS += ${shell $(DEFINE) "$(CC)" __GLIBCXX__}
endif

5
libs/libxx/libcxxabi.defs
View File

@ -35,6 +35,11 @@ distclean::
context:: libcxxabi
ifeq ($(CONFIG_LIBCXXABI), y)
CXXFLAGS += ${shell $(DEFINE) "$(CC)" LIBCXX_BUILDING_LIBCXXABI}
CXXFLAGS += -I $(TOPDIR)/libs/libxx/libcxxabi/include
endif
# C++ABI files
CPPSRCS += cxa_aux_runtime.cpp cxa_default_handlers.cpp cxa_demangle.cpp cxa_exception_storage.cpp
CPPSRCS += cxa_guard.cpp cxa_handlers.cpp cxa_thread_atexit.cpp cxa_vector.cpp cxa_virtual.cpp