Skip to content

Commit b57f3bb

Browse files
cuiziweizwAlan C. Assis
authored andcommitted
Fix macOS build error.
1. fix #14774. Change the defconfig of libcxxtest and select libcxxabi by default to fix sim:libcxxtest build in macOS CI can't find cxxabi.h. 2. fix #15491. libcxxabi cannot be used with uclibc, so when compiling macos sim, libcxxabi cannot be selected by default in Kconfig. Signed-off-by: cuiziwei <cuiziwei@xiaomi.com>
1 parent df65980 commit b57f3bb

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

boards/sim/sim/sim/configs/libcxxtest/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
4444
CONFIG_INIT_ENTRYPOINT="nsh_main"
4545
CONFIG_IOB_NOTIFIER=y
4646
CONFIG_LIBCXX=y
47+
CONFIG_LIBCXXABI=y
4748
CONFIG_LIBC_ENVPATH=y
4849
CONFIG_LIBC_EXECFUNCS=y
4950
CONFIG_LIBC_LOCALE=y

libs/libxx/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ if !LIBCXXMINI
7171

7272
choice
7373
prompt "C++ low level library select"
74-
default LIBCXXABI if ARCH_SIM && HOST_MACOS
7574
default LIBSUPCXX_TOOLCHAIN
7675

7776
config LIBCXXABI

0 commit comments

Comments
 (0)