Unify the c++ standard library name to libxx (#19)
libs/libxx/Makefile, and tools/*.mk: Use common library name libxx.a, regardless of which libc++ library is selected.
This commit is contained in:
parent
5fb5a9dfdd
commit
443255f348
@ -35,12 +35,6 @@
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
|
||||
ifeq ($(CONFIG_LIBCXX),y)
|
||||
LIBXX=libcxx
|
||||
else
|
||||
LIBXX=libxx
|
||||
endif
|
||||
|
||||
# Sources
|
||||
|
||||
ASRCS =
|
||||
@ -93,7 +87,7 @@ CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT))
|
||||
SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS) $(CXXOBJS)
|
||||
|
||||
BIN = $(LIBXX)$(LIBEXT)
|
||||
BIN = libxx$(LIBEXT)
|
||||
|
||||
all: $(BIN)
|
||||
.PHONY: depend clean distclean
|
||||
|
@ -72,12 +72,6 @@ CLEANDIRS += $(APPDIR)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_LIBCXX),y)
|
||||
LIBXX=libcxx
|
||||
else
|
||||
LIBXX=libxx
|
||||
endif
|
||||
|
||||
KERNDEPDIRS += sched drivers boards $(ARCH_SRC)
|
||||
KERNDEPDIRS += fs binfmt
|
||||
CONTEXTDIRS = boards $(APPDIR)
|
||||
|
@ -74,7 +74,7 @@ endif
|
||||
# be defined in Make.defs for this to work!
|
||||
|
||||
ifeq ($(CONFIG_HAVE_CXX),y)
|
||||
NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
|
||||
NUTTXLIBS += staging$(DELIM)libxx$(LIBEXT)
|
||||
endif
|
||||
|
||||
# Add library for application support.
|
||||
|
@ -63,7 +63,7 @@ USERLIBS += staging$(DELIM)libumm$(LIBEXT) staging$(DELIM)libuarch$(LIBEXT)
|
||||
# be defined in Make.defs for this to work!
|
||||
|
||||
ifeq ($(CONFIG_HAVE_CXX),y)
|
||||
USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
|
||||
USERLIBS += staging$(DELIM)libxx$(LIBEXT)
|
||||
endif
|
||||
|
||||
# Add libraries for network support
|
||||
|
@ -188,10 +188,10 @@ $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT): context
|
||||
staging$(DELIM)libuarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT)
|
||||
$(Q) $(call INSTALL_LIB,$<,$@)
|
||||
|
||||
libs$(DELIM)libxx$(DELIM)$(LIBXX)$(LIBEXT): context
|
||||
$(Q) $(MAKE) -C libs$(DELIM)libxx TOPDIR="$(TOPDIR)" $(LIBXX)$(LIBEXT) KERNEL=n
|
||||
libs$(DELIM)libxx$(DELIM)libxx$(LIBEXT): context
|
||||
$(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,$<,$@)
|
||||
|
||||
$(APPDIR)$(DELIM)libapps$(LIBEXT): context
|
||||
|
@ -72,7 +72,7 @@ endif
|
||||
# be defined in Make.defs for this to work!
|
||||
|
||||
ifeq ($(CONFIG_HAVE_CXX),y)
|
||||
USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
|
||||
USERLIBS += staging$(DELIM)libxx$(LIBEXT)
|
||||
endif
|
||||
|
||||
# Add library for application support.
|
||||
|
@ -955,7 +955,7 @@ if __name__ == '__main__':
|
||||
lib_prj.make_src_nodes(group_src_list)
|
||||
lib_prj.make_include(group_src_list)
|
||||
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_define('cxx_def', 'CONFIG_WCHAR_BUILTIN')
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user