OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tools: Missed a couple of changes of libcxx to libxx.

This commit is contained in:
Gregory Nutt 2018-05-29 18:16:43 -06:00
parent 4697a74cc7
commit a0c663edc9
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/README.txt
View File

@ -22,4 +22,12 @@ creatures. The have these properties:
nxsem_wait() must be used. Within libraries, the macro _SEM_WAIT() nxsem_wait() must be used. Within libraries, the macro _SEM_WAIT()
(as defined in include/nuttx/semaphore.h) is used instead. The (as defined in include/nuttx/semaphore.h) is used instead. The
definition of this macro accounts for the different usage environments. definition of this macro accounts for the different usage environments.
NOTE: The libraries under libs/ build differently from other NuttX
components: There are no build-related files in the libs/ directory; it
is simply a container for other well-known, individual library directories.
The upper level Makefile logic is aware of the libraries within the libs/
container.
The only real function of the libs/ directory is to prevent the top-level
directory from becoming cluttered with individual libraries.

4
tools/FlatLibs.mk
View File

@ -69,7 +69,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)libcxx$(LIBEXT) NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
endif endif
# Add library for application support. # Add library for application support.
@ -124,7 +124,7 @@ endif
# Add C++ library # Add C++ library
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
NUTTXLIBS += staging$(DELIM)libcxx$(LIBEXT) NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
endif endif
# Export all libraries # Export all libraries

4
tools/KernelLibs.mk
View File

@ -68,7 +68,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)libcxx$(LIBEXT) USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
endif endif
# Add libraries for network support # Add libraries for network support
@ -119,7 +119,7 @@ endif
# Add C++ library # Add C++ library
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
NUTTXLIBS += staging$(DELIM)libcxx$(LIBEXT) NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
endif endif
# Export only the user libraries # Export only the user libraries

4
tools/ProtectedLibs.mk
View File

@ -69,7 +69,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)libcxx$(LIBEXT) USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
endif endif
# Add library for application support. # Add library for application support.
@ -126,7 +126,7 @@ endif
# Add C++ library # Add C++ library
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
NUTTXLIBS += staging$(DELIM)libcxx$(LIBEXT) NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
endif endif
# Export only the user libraries # Export only the user libraries

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 == 'libcxx': if lib_name == 'libxx' or lib_name == 'libcxx':
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: