diff --git a/tools/Directories.mk b/tools/Directories.mk
index 7b048516b1..98659a1313 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)
+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