From 6354a7879102c444559060ada8a24e1d0de01055 Mon Sep 17 00:00:00 2001
From: zhuyanlin <zhuyanlin1@xiaomi.com>
Date: Thu, 19 Aug 2021 17:13:43 +0800
Subject: [PATCH] libc:libcxx: add support for libcxxabi.

libcxxabi is either-or select with glibcxx.

Change-Id: I4fbea19f0648ddc318379dd43bac8406f7c86927
---
 libs/libxx/libcxx.defs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs
index 37c1f204099..4fcb993483e 100644
--- a/libs/libxx/libcxx.defs
+++ b/libs/libxx/libcxx.defs
@@ -38,9 +38,15 @@ distclean::
 	$(Q) $(DIRUNLINK) $(TOPDIR)/include/libcxx
 #	$(call DELDIR, libcxx)
 
-CXXFLAGS += ${shell $(DEFINE) "$(CC)" __GLIBCXX__}
 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
+CXXFLAGS += ${shell $(DEFINE) "$(CC)" __GLIBCXX__}
+endif
+
 # Workaround the following warning with "c++ (Ubuntu 9.3.0-10ubuntu2) 9.3.0"
 #
 # libcxx/src/barrier.cpp: In constructor 'std::__1::__barrier_algorithm_base::__barrier_algorithm_base(ptrdiff_t&)':