Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macOS build error. #15774

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −1
Open

Fix macOS build error. #15774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions boards/sim/sim/sim/configs/libcxxtest/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion libs/libxx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ if !LIBCXXMINI

choice
prompt "C++ low level library select"
default LIBCXXABI if ARCH_SIM && HOST_MACOS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not enable LIBCXXABI by default if ARCH_SIM ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cause select LIBCXXMINI by default. if select LIBCXXABI, we need to select LIBCXX by default if ARCH_SIM

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see line 70, this choice snippet is no LIBCXXMINI case

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean why not just remove HOST_MACOS:

default LIBCXXABI if ARCH_SIM && HOST_MACOS
->
default LIBCXXABI if ARCH_SIM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some sim defconfig(like https://github.com/apache/nuttx/blob/master/boards/sim/sim/sim/configs/cxxtest/defconfig) enable uclibcxx by default. If libcxxabi is selected by default, there may also be compilation problems.

default LIBSUPCXX_TOOLCHAIN

config LIBCXXABI
Expand Down
Loading