mirror of
https://github.com/apache/nuttx.git
synced 2026-06-02 17:48:54 +08:00
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 <cuiziwei@xiaomi.com>
This commit is contained in:
@@ -44,6 +44,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
|
|||||||
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
||||||
CONFIG_IOB_NOTIFIER=y
|
CONFIG_IOB_NOTIFIER=y
|
||||||
CONFIG_LIBCXX=y
|
CONFIG_LIBCXX=y
|
||||||
|
CONFIG_LIBCXXABI=y
|
||||||
CONFIG_LIBC_ENVPATH=y
|
CONFIG_LIBC_ENVPATH=y
|
||||||
CONFIG_LIBC_EXECFUNCS=y
|
CONFIG_LIBC_EXECFUNCS=y
|
||||||
CONFIG_LIBC_LOCALE=y
|
CONFIG_LIBC_LOCALE=y
|
||||||
|
|||||||
@@ -71,7 +71,6 @@ if !LIBCXXMINI
|
|||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "C++ low level library select"
|
prompt "C++ low level library select"
|
||||||
default LIBCXXABI if ARCH_SIM && HOST_MACOS
|
|
||||||
default LIBSUPCXX_TOOLCHAIN
|
default LIBSUPCXX_TOOLCHAIN
|
||||||
|
|
||||||
config LIBCXXABI
|
config LIBCXXABI
|
||||||
|
|||||||
Reference in New Issue
Block a user