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

Unify the c++ standard library name to libxx (#19)

Browse Source 
libs/libxx/Makefile, and tools/*.mk:  Use common library name libxx.a, regardless of which libc++ library is selected.
This commit is contained in:
Xiang Xiao 2019-12-31 10:28:48 -06:00 committed by patacongo
parent 5fb5a9dfdd
commit 443255f348
7 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/libxx/Makefile
View File

@ -35,12 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
ifeq ($(CONFIG_LIBCXX),y)
LIBXX=libcxx
else
LIBXX=libxx
endif
# Sources # Sources
ASRCS = ASRCS =
@ -93,7 +87,7 @@ CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS)
OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS)
BIN = $(LIBXX)$(LIBEXT) BIN = libxx$(LIBEXT)
all: $(BIN) all: $(BIN)
.PHONY: depend clean distclean .PHONY: depend clean distclean

6
tools/Directories.mk
View File

@ -72,12 +72,6 @@ CLEANDIRS += $(APPDIR)
endif endif
endif endif
ifeq ($(CONFIG_LIBCXX),y)
LIBXX=libcxx
else
LIBXX=libxx
endif
KERNDEPDIRS += sched drivers boards $(ARCH_SRC) KERNDEPDIRS += sched drivers boards $(ARCH_SRC)
KERNDEPDIRS += fs binfmt KERNDEPDIRS += fs binfmt
CONTEXTDIRS = boards $(APPDIR) CONTEXTDIRS = boards $(APPDIR)

2
tools/FlatLibs.mk
View File

@ -74,7 +74,7 @@ endif
# be defined in Make.defs for this to work! # be defined in Make.defs for this to work!
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT) NUTTXLIBS += staging$(DELIM)libxx$(LIBEXT)
endif endif
# Add library for application support. # Add library for application support.

2
tools/KernelLibs.mk
View File

@ -63,7 +63,7 @@ USERLIBS += staging$(DELIM)libumm$(LIBEXT) staging$(DELIM)libuarch$(LIBEXT)
# be defined in Make.defs for this to work! # be defined in Make.defs for this to work!
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT) USERLIBS += staging$(DELIM)libxx$(LIBEXT)
endif endif
# Add libraries for network support # Add libraries for network support

6
tools/LibTargets.mk
View File

@ -188,10 +188,10 @@ $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT): context
staging$(DELIM)libuarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT) staging$(DELIM)libuarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT)
$(Q) $(call INSTALL_LIB,$<,$@) $(Q) $(call INSTALL_LIB,$<,$@)
libs$(DELIM)libxx$(DELIM)$(LIBXX)$(LIBEXT): context libs$(DELIM)libxx$(DELIM)libxx$(LIBEXT): context
$(Q) $(MAKE) -C libs$(DELIM)libxx TOPDIR="$(TOPDIR)" $(LIBXX)$(LIBEXT) KERNEL=n $(Q) $(MAKE) -C libs$(DELIM)libxx TOPDIR="$(TOPDIR)" libxx$(LIBEXT) KERNEL=n
staging$(DELIM)$(LIBXX)$(LIBEXT): libs$(DELIM)libxx$(DELIM)$(LIBXX)$(LIBEXT) staging$(DELIM)libxx$(LIBEXT): libs$(DELIM)libxx$(DELIM)libxx$(LIBEXT)
$(Q) $(call INSTALL_LIB,$<,$@) $(Q) $(call INSTALL_LIB,$<,$@)
$(APPDIR)$(DELIM)libapps$(LIBEXT): context $(APPDIR)$(DELIM)libapps$(LIBEXT): context

2
tools/ProtectedLibs.mk
View File

@ -72,7 +72,7 @@ endif
# be defined in Make.defs for this to work! # be defined in Make.defs for this to work!
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT) USERLIBS += staging$(DELIM)libxx$(LIBEXT)
endif endif
# Add library for application support. # Add library for application support.

2
tools/ide_exporter.py
View File

@ -955,7 +955,7 @@ if __name__ == '__main__':
lib_prj.make_src_nodes(group_src_list) lib_prj.make_src_nodes(group_src_list)
lib_prj.make_include(group_src_list) lib_prj.make_include(group_src_list)
lib_prj.make_output_dir(lib_name) lib_prj.make_output_dir(lib_name)
if lib_name == 'libxx' or lib_name == 'libcxx': if lib_name == 'libxx':
lib_prj.add_misc('cxx_misc') lib_prj.add_misc('cxx_misc')
lib_prj.add_define('cxx_def', 'CONFIG_WCHAR_BUILTIN') lib_prj.add_define('cxx_def', 'CONFIG_WCHAR_BUILTIN')
else: else: