From 19e5ba9ef4a2d9e0fac0faf3d755157f08b8fc1e Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Mon, 30 Aug 2021 12:09:08 +0800
Subject: [PATCH] libxx: Move libcxxabi special setting from libcxx.defs to
 libcxxabi.defs

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 libs/libxx/libcxx.defs    | 5 +----
 libs/libxx/libcxxabi.defs | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs
index 285269ff448..99dd1a773ed 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 b64b475112b..4e4b5b51a21 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