From 5f37226b6dbb88014cfdf9444b9ca28a5318353e Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 30 Sep 2019 07:03:55 -0600 Subject: [PATCH] tools/ Make fragments: Fix the various minor issue for NUTTXLIBS/USERLIBS 1. Remove libcxx duplication in FlatLibs.mk and from kernel space 2. Remove libpass1 from KernelLibs.mk since kernel build doesn't support the two pass mode 3. Remove FSDIR related comment since file system cannot be disabled now --- tools/FlatLibs.mk | 12 +----------- tools/KernelLibs.mk | 23 ++--------------------- tools/ProtectedLibs.mk | 15 ++------------- 3 files changed, 5 insertions(+), 45 deletions(-) diff --git a/tools/FlatLibs.mk b/tools/FlatLibs.mk index b782b09ea31..61e16e6a065 100644 --- a/tools/FlatLibs.mk +++ b/tools/FlatLibs.mk @@ -36,8 +36,6 @@ # NUTTXLIBS is the list of NuttX libraries that is passed to the # processor-specific Makefile to build the final NuttX target. -# Libraries in FSDIRS are excluded if file descriptor support -# is disabled. # USERLIBS is the list of libraries used to build the final user-space # application # EXPORTLIBS is the list of libraries that should be exported by @@ -46,9 +44,7 @@ NUTTXLIBS = staging$(DELIM)libsched$(LIBEXT) USERLIBS = -# Driver support. Generally depends on file descriptor support but there -# are some components in the drivers directory that are needed even if file -# descriptors are not supported. +# Driver support. NUTTXLIBS += staging$(DELIM)libdrivers$(LIBEXT) @@ -130,12 +126,6 @@ ifeq ($(CONFIG_WIRELESS),y) NUTTXLIBS += staging$(DELIM)libwireless$(LIBEXT) endif -# Add C++ library - -ifeq ($(CONFIG_HAVE_CXX),y) -NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT) -endif - # Add DSP library ifeq ($(CONFIG_LIBDSP),y) diff --git a/tools/KernelLibs.mk b/tools/KernelLibs.mk index 11df9e5b0d9..5922180beed 100644 --- a/tools/KernelLibs.mk +++ b/tools/KernelLibs.mk @@ -35,8 +35,6 @@ # NUTTXLIBS is the list of NuttX libraries that is passed to the # processor-specific Makefile to build the final NuttX target. -# Libraries in FSDIRS are excluded if file descriptor support -# is disabled. # USERLIBS is the list of libraries used to build the final user-space # application # EXPORTLIBS is the list of libraries that should be exported by @@ -45,9 +43,7 @@ NUTTXLIBS = staging$(DELIM)libsched$(LIBEXT) USERLIBS = -# Driver support. Generally depends on file descriptor support but there -# are some components in the drivers directory that are needed even if file -# descriptors are not supported. +# Driver support. NUTTXLIBS += staging$(DELIM)libdrivers$(LIBEXT) @@ -56,22 +52,13 @@ NUTTXLIBS += staging$(DELIM)libdrivers$(LIBEXT) NUTTXLIBS += staging$(DELIM)libboards$(LIBEXT) # Add libraries for syscall support. The C library will be needed by -# both the kernel- and user-space builds. For now, the memory manager (mm) -# is placed in user space (only). +# both the kernel- and user-space builds. NUTTXLIBS += staging$(DELIM)libstubs$(LIBEXT) staging$(DELIM)libkc$(LIBEXT) NUTTXLIBS += staging$(DELIM)libkmm$(LIBEXT) staging$(DELIM)libkarch$(LIBEXT) USERLIBS += staging$(DELIM)libproxies$(LIBEXT) staging$(DELIM)libuc$(LIBEXT) USERLIBS += staging$(DELIM)libumm$(LIBEXT) staging$(DELIM)libuarch$(LIBEXT) -# Add libraries for two pass build support. The special directory pass1 -# may be populated so that application generated logic can be included into -# the kernel build - -ifeq ($(CONFIG_BUILD_2PASS),y) -NUTTXLIBS += staging$(DELIM)libpass1$(LIBEXT) -endif - # Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must # be defined in Make.defs for this to work! @@ -124,12 +111,6 @@ ifeq ($(CONFIG_WIRELESS),y) NUTTXLIBS += staging$(DELIM)libwireless$(LIBEXT) endif -# Add C++ library - -ifeq ($(CONFIG_HAVE_CXX),y) -NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT) -endif - # Add DSP library ifeq ($(CONFIG_LIBDSP),y) diff --git a/tools/ProtectedLibs.mk b/tools/ProtectedLibs.mk index 91719af7e0b..c7b7d9865ed 100644 --- a/tools/ProtectedLibs.mk +++ b/tools/ProtectedLibs.mk @@ -36,8 +36,6 @@ # NUTTXLIBS is the list of NuttX libraries that is passed to the # processor-specific Makefile to build the final NuttX target. -# Libraries in FSDIRS are excluded if file descriptor support -# is disabled. # USERLIBS is the list of libraries used to build the final user-space # application # EXPORTLIBS is the list of libraries that should be exported by @@ -46,9 +44,7 @@ NUTTXLIBS = staging$(DELIM)libsched$(LIBEXT) USERLIBS = -# Driver support. Generally depends on file descriptor support but there -# are some components in the drivers directory that are needed even if file -# descriptors are not supported. +# Driver support. NUTTXLIBS += staging$(DELIM)libdrivers$(LIBEXT) @@ -57,8 +53,7 @@ NUTTXLIBS += staging$(DELIM)libdrivers$(LIBEXT) NUTTXLIBS += staging$(DELIM)libboards$(LIBEXT) # Add libraries for syscall support. The C library will be needed by -# both the kernel- and user-space builds. For now, the memory manager (mm) -# is placed in user space (only). +# both the kernel- and user-space builds. NUTTXLIBS += staging$(DELIM)libstubs$(LIBEXT) staging$(DELIM)libkc$(LIBEXT) NUTTXLIBS += staging$(DELIM)libkmm$(LIBEXT) staging$(DELIM)libkarch$(LIBEXT) @@ -131,12 +126,6 @@ ifeq ($(CONFIG_WIRELESS),y) NUTTXLIBS += staging$(DELIM)libwireless$(LIBEXT) endif -# Add C++ library - -ifeq ($(CONFIG_HAVE_CXX),y) -NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT) -endif - # Add DSP library ifeq ($(CONFIG_LIBDSP),y)