diff --git a/libs/libxx/CMakeLists.txt b/libs/libxx/CMakeLists.txt
index f9856903b93..6dacc93499c 100644
--- a/libs/libxx/CMakeLists.txt
+++ b/libs/libxx/CMakeLists.txt
@@ -32,7 +32,7 @@ if(CONFIG_HAVE_CXX)
     include(uClibc++.cmake)
   elseif(CONFIG_LIBCXX)
     include(libcxx.cmake)
-  else()
+  elseif(CONFIG_LIBCXXMINI)
     include(libcxxmini.cmake)
   endif()
 
diff --git a/libs/libxx/Makefile b/libs/libxx/Makefile
index 7b5bb8ee3a4..396c6646bd0 100644
--- a/libs/libxx/Makefile
+++ b/libs/libxx/Makefile
@@ -33,12 +33,13 @@ ifeq ($(CONFIG_UCLIBCXX),y)
 include uClibc++.defs
 else ifeq ($(CONFIG_LIBCXX),y)
 include libcxx.defs
-else
+else ifeq ($(CONFIG_LIBCXXMINI),y)
 include libcxxmini.defs
+endif
+
 ifeq ($(CONFIG_ETL),y)
 include etl.defs
 endif
-endif
 
 ifeq ($(CONFIG_LIBCXXABI),y)
 include libcxxabi.defs