From b57f3bb8409f4506d24d6600cbbe91ce3c90d1c4 Mon Sep 17 00:00:00 2001 From: cuiziwei Date: Thu, 6 Feb 2025 11:50:05 +0800 Subject: [PATCH] Fix macOS build error. 1. fix https://github.com/apache/nuttx/issues/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 https://github.com/apache/nuttx/issues/15491. libcxxabi cannot be used with uclibc, so when compiling macos sim, libcxxabi cannot be selected by default in Kconfig. Signed-off-by: cuiziwei --- boards/sim/sim/sim/configs/libcxxtest/defconfig | 1 + libs/libxx/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/sim/sim/sim/configs/libcxxtest/defconfig b/boards/sim/sim/sim/configs/libcxxtest/defconfig index 0b52f2b148..86df52f1db 100644 --- a/boards/sim/sim/sim/configs/libcxxtest/defconfig +++ b/boards/sim/sim/sim/configs/libcxxtest/defconfig @@ -44,6 +44,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_IOB_NOTIFIER=y CONFIG_LIBCXX=y +CONFIG_LIBCXXABI=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_LOCALE=y diff --git a/libs/libxx/Kconfig b/libs/libxx/Kconfig index 2706720a71..62618e15bb 100644 --- a/libs/libxx/Kconfig +++ b/libs/libxx/Kconfig @@ -71,7 +71,6 @@ if !LIBCXXMINI choice prompt "C++ low level library select" - default LIBCXXABI if ARCH_SIM && HOST_MACOS default LIBSUPCXX_TOOLCHAIN config LIBCXXABI