diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs
index 7c60e59b41..42b4c004cd 100644
--- a/libs/libxx/libcxx.defs
+++ b/libs/libxx/libcxx.defs
@@ -43,10 +43,7 @@ distclean::
 
 CXXFLAGS += ${shell $(DEFINE) "$(CC)" _LIBCPP_BUILDING_LIBRARY}
 
-ifeq ($(CONFIG_LIBCXXABI), y)
-CXXFLAGS += ${shell $(DEFINE) "$(CC)" LIBCXX_BUILDING_LIBCXXABI}
-CXXFLAGS += -I $(TOPDIR)/libs/libxx/libcxxabi/include
-else
+ifeq ($(CONFIG_LIBSUPCXX), y)
 CXXFLAGS += ${shell $(DEFINE) "$(CC)" __GLIBCXX__}
 endif
 
diff --git a/libs/libxx/libcxxabi.defs b/libs/libxx/libcxxabi.defs
index b64b475112..4e4b5b51a2 100644
--- a/libs/libxx/libcxxabi.defs
+++ b/libs/libxx/libcxxabi.defs
@@ -35,6 +35,11 @@ distclean::
 
 context:: libcxxabi
 
+ifeq ($(CONFIG_LIBCXXABI), y)
+CXXFLAGS += ${shell $(DEFINE) "$(CC)" LIBCXX_BUILDING_LIBCXXABI}
+CXXFLAGS += -I $(TOPDIR)/libs/libxx/libcxxabi/include
+endif
+
 # C++ABI files
 CPPSRCS += cxa_aux_runtime.cpp cxa_default_handlers.cpp cxa_demangle.cpp cxa_exception_storage.cpp
 CPPSRCS += cxa_guard.cpp cxa_handlers.cpp cxa_thread_atexit.cpp cxa_vector.cpp cxa_virtual.cpp