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

Merged in antmerlino/nuttx/fix-libcxx-build-warning (pull request #719)

Browse Source 
Fixes build error. libcxx moved into libs/libxx/libcxx

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2018-09-12 21:38:08 +00:00 committed by GregoryN
parent 11d181d3d3
commit 57e5142b98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/Directories.mk
View File

@ -89,7 +89,7 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
USERDIRS += libs$(DELIM)libc mm $(USER_ADDONS)
ifeq ($(CONFIG_HAVE_CXX),y)
USERDIRS += libs$(DELIM)$(LIBXX)
USERDIRS += libs$(DELIM)libxx$(DELIM)$(LIBXX)
endif
else
@ -97,7 +97,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
USERDIRS += libs$(DELIM)libc mm
ifeq ($(CONFIG_HAVE_CXX),y)
USERDIRS += libs$(DELIM)$(LIBXX)
USERDIRS += libs$(DELIM)libxx$(DELIM)$(LIBXX)
endif
else
@ -105,9 +105,9 @@ else
NONFSDIRS += libs$(DELIM)libc mm
OTHERDIRS += $(USER_ADDONS)
ifeq ($(CONFIG_HAVE_CXX),y)
NONFSDIRS += libs$(DELIM)$(LIBXX)
NONFSDIRS += libs$(DELIM)libxx$(DELIM)$(LIBXX)
else
OTHERDIRS += libs$(DELIM)$(LIBXX)
OTHERDIRS += libs$(DELIM)libxx$(DELIM)$(LIBXX)
endif
endif