Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

libxx: Unify uClibc++ and libc++ config

Browse Source 
code just need check CONFIG_CXX_EXCEPTION/CONFIG_CXX_LIBSUPCXX now,
instead uClibc++/libc++ specific config

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I3b00a5a6701b8bf1c70de89f2d924592ca3e38b0
This commit is contained in:
Xiang Xiao
2020-06-28 23:03:57 +08:00
committed by Alan Carvalho de Assis
parent 9db5d2aeea
commit 6abd03d53f
13 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libxx/Makefile
+4 -14
View File
@@ -35,17 +35,7 @@
include $(TOPDIR)/Make.defs
CXXSRCS = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx libxx_cxa_atexit.cxx
CXXSRCS += libxx_cxa_guard.cxx
# Some of the libs/libxx/ files are not need if uClibc++ or libcxx is installed
# because uClibx++ or libcxx will replace them
ifeq (,$(findstring y,$(CONFIG_UCLIBCXX) $(CONFIG_LIBCXX)))
CXXSRCS += libxx_delete.cxx libxx_delete_sized.cxx libxx_deletea.cxx
CXXSRCS += libxx_deletea_sized.cxx libxx_new.cxx libxx_newa.cxx
CXXSRCS += libxx_stdthrow.cxx
endif
CXXSRCS = libxx_cxa_atexit.cxx libxx_eabi_atexit.cxx
# Include the uClibc++ Make.defs file if selected. If it is included,
# the uClibc++/Make.defs file will add its files to the source file list,
@@ -59,10 +49,10 @@ endif
ifeq ($(CONFIG_UCLIBCXX),y)
include uClibc++/Make.defs
endif
ifeq ($(CONFIG_LIBCXX),y)
else ifeq ($(CONFIG_LIBCXX),y)
include libcxx/Make.defs
else
include cxx.defs
endif
# Object Files