From 2b6dd99c2e422782b55a64a1d5fe3b155bd72f7d Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 13 Sep 2018 13:59:28 -0600
Subject: [PATCH] Revert "Merged in antmerlino/nuttx/fix-libcxx-build-warning
 (pull request #719)"

This reverts commit 57e5142b98a32054bce67f38822219f81fc4c435.
---
 tools/Directories.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/Directories.mk b/tools/Directories.mk
index 98659a13138..7b048516b1d 100644
--- a/tools/Directories.mk
+++ b/tools/Directories.mk
@@ -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$(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$(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$(DELIM)$(LIBXX)
+NONFSDIRS += libs$(DELIM)$(LIBXX)
 else
-OTHERDIRS += libs$(DELIM)libxx$(DELIM)$(LIBXX)
+OTHERDIRS += libs$(DELIM)$(LIBXX)
 endif
 
 endif