From c21dfbb93c3b3f3443e3d5dc35281a2bde4078da Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Tue, 25 Sep 2018 20:46:02 +0000
Subject: [PATCH] Merged in antmerlino/nuttx/libcxx-build-fix (pull request
 #727)

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

Approved-by: GregoryN <gnutt@nuttx.org>
---
 tools/Directories.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/Directories.mk b/tools/Directories.mk
index eaba9fd62c7..ac31651cc3d 100644
--- a/tools/Directories.mk
+++ b/tools/Directories.mk
@@ -74,7 +74,7 @@ endif
 #   configurations.
 
 ifeq ($(CONFIG_LIBCXX),y)
-LIBXX=libxx$(DELIM)libcxx
+LIBXX=libcxx
 else
 LIBXX=libxx
 endif
@@ -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
 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
 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
 else
-OTHERDIRS += libs$(DELIM)$(LIBXX)
+OTHERDIRS += libs$(DELIM)libxx
 endif
 
 endif