diff --git a/libs/libxx/Makefile b/libs/libxx/Makefile
index a34d969b83c..6aab484baac 100644
--- a/libs/libxx/Makefile
+++ b/libs/libxx/Makefile
@@ -62,7 +62,7 @@ OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) $(CPPOBJS)
 BIN = libxx$(LIBEXT)
 
 all: $(BIN)
-.PHONY: depend clean distclean dirlinks
+.PHONY: depend clean distclean context
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -79,7 +79,7 @@ $(CPPOBJS): %$(OBJEXT): %.cpp
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $^)
 
-dirlinks::
+context::
 
 makedepfile: $(CXXSRCS:.cxx=.ddx) $(CPPSRCS:.cpp=.ddp)
 	$(call CATFILE, Make.dep, $^)
diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs
index 77a52671ad8..0e99c20c42f 100644
--- a/libs/libxx/libcxx.defs
+++ b/libs/libxx/libcxx.defs
@@ -33,7 +33,7 @@ VERSION=12.0.0
 $(TOPDIR)/include/libcxx: libcxx
 	$(Q) $(DIRLINK) $(CURDIR)/libcxx/include $(TOPDIR)/include/libcxx
 
-dirlinks:: $(TOPDIR)/include/libcxx
+context:: $(TOPDIR)/include/libcxx
 
 distclean::
 #	$(Q) $(DELFILE) libcxx-$(VERSION).src.tar.xz
diff --git a/libs/libxx/uClibc++.defs b/libs/libxx/uClibc++.defs
index 175a6e75b3e..6e19e7952df 100644
--- a/libs/libxx/uClibc++.defs
+++ b/libs/libxx/uClibc++.defs
@@ -28,7 +28,7 @@ $(TOPDIR)/include/uClibc++:
 	$(Q) $(DIRLINK) $(CURDIR)/uClibc++/include $(TOPDIR)/include/uClibc++
 	$(Q) $(COPYFILE) $(CURDIR)/system_configuration.h $(TOPDIR)/include/uClibc++
 
-dirlinks:: $(TOPDIR)/include/uClibc++
+context:: $(TOPDIR)/include/uClibc++
 
 distclean::
 	$(Q) $(DELFILE) $(TOPDIR)/include/uClibc++/system_configuration.h
diff --git a/tools/Directories.mk b/tools/Directories.mk
index 51c95dbd3a3..cd257f9ceb7 100644
--- a/tools/Directories.mk
+++ b/tools/Directories.mk
@@ -97,6 +97,9 @@ endif
 endif
 
 CONTEXTDIRS += libs$(DELIM)libc
+ifeq ($(CONFIG_HAVE_CXX),y)
+CONTEXTDIRS += libs$(DELIM)libxx
+endif
 
 ifeq ($(CONFIG_NX),y)
 KERNDEPDIRS += graphics
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index cc1020c6ab3..52fa628d8d0 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -319,7 +319,6 @@ else ifneq ($(CONFIG_ARCH_CHIP),)
 endif
 
 dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip drivers/platform
-	$(Q) $(MAKE) -C libs/libxx dirlinks
 	$(Q) $(MAKE) -C boards dirlinks
 	$(Q) $(MAKE) -C openamp dirlinks
 	$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 2b731e2f4d4..43a695e29ee 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -298,7 +298,6 @@ else ifneq ($(CONFIG_ARCH_CHIP),)
 endif
 
 dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip drivers\platform
-	$(Q) $(MAKE) -C libs/libxx dirlinks
 	$(Q) $(MAKE) -C boards dirlinks
 	$(Q) $(MAKE) -C openamp dirlinks
 	$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks