Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-27 18:58:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes issue with libcxx build. This was changed multiple times, but should be fixed now.

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino
2018-09-25 20:46:02 +00:00
committed by GregoryN
parent 8373784afe
commit c21dfbb93c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/Directories.mk
+5 -5
View File
@@ -74,7 +74,7 @@ endif
# configurations. # configurations.
ifeq ($(CONFIG_LIBCXX),y) ifeq ($(CONFIG_LIBCXX),y)
LIBXX=libxx$(DELIM)libcxx LIBXX=libcxx
else else
LIBXX=libxx LIBXX=libxx
endif endif
@@ -89,7 +89,7 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
USERDIRS += libs$(DELIM)libc mm $(USER_ADDONS) USERDIRS += libs$(DELIM)libc mm $(USER_ADDONS)
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
USERDIRS += libs$(DELIM)$(LIBXX) USERDIRS += libs$(DELIM)libxx
endif endif
else else
@@ -97,7 +97,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
USERDIRS += libs$(DELIM)libc mm USERDIRS += libs$(DELIM)libc mm
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
USERDIRS += libs$(DELIM)$(LIBXX) USERDIRS += libs$(DELIM)libxx
endif endif
else else
@@ -105,9 +105,9 @@ else
NONFSDIRS += libs$(DELIM)libc mm NONFSDIRS += libs$(DELIM)libc mm
OTHERDIRS += $(USER_ADDONS) OTHERDIRS += $(USER_ADDONS)
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
NONFSDIRS += libs$(DELIM)$(LIBXX) NONFSDIRS += libs$(DELIM)libxx
else else
OTHERDIRS += libs$(DELIM)$(LIBXX) OTHERDIRS += libs$(DELIM)libxx
endif endif
endif endif