Skip to content

Guard include/cxx with CONFIG_LIBMINIABI for C++ builds #18465

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

Open
arjav1528 wants to merge 2 commits into
base: master
Choose a base branch
from
+18 −1
Open

Guard include/cxx with CONFIG_LIBMINIABI for C++ builds #18465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e91a0b8
tools/Config.mk: Add conditional include path for mini ABI support
arjav1528 Feb 27, 2026
e40e0f8
cmake: Add conditional include path for mini ABI support across archi…
arjav1528 Feb 27, 2026
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
3 changes: 3 additions & 0 deletions arch/arm/src/cmake/platform.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ endif()

if(CONFIG_LIBCXXTOOLCHAIN)
nuttx_find_toolchain_lib(libstdc++.a)
endif()

if(CONFIG_LIBMINIABI)
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
endif()

Expand Down
3 changes: 3 additions & 0 deletions arch/arm64/src/cmake/platform.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ endif()

if(CONFIG_LIBCXXTOOLCHAIN)
nuttx_find_toolchain_lib(libstdc++.a)
endif()

if(CONFIG_LIBMINIABI)
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
endif()

Expand Down
3 changes: 3 additions & 0 deletions arch/risc-v/src/cmake/platform.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ endif()

if(CONFIG_LIBCXXTOOLCHAIN)
nuttx_find_toolchain_lib(libstdc++.a)
endif()

if(CONFIG_LIBMINIABI)
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
endif()

Expand Down
3 changes: 3 additions & 0 deletions arch/tricore/src/cmake/platform.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ if(CONFIG_TRICORE_TOOLCHAIN_GNU)
endif()
if(CONFIG_LIBCXXTOOLCHAIN)
nuttx_find_toolchain_lib(libstdc++.a)
endif()

if(CONFIG_LIBMINIABI)
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
endif()
if(CONFIG_COVERAGE_TOOLCHAIN)
Expand Down
3 changes: 3 additions & 0 deletions arch/x86_64/src/cmake/platform.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ endif()

if(CONFIG_LIBCXXTOOLCHAIN)
nuttx_find_toolchain_lib(libstdc++.a)
endif()

if(CONFIG_LIBMINIABI)
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
endif()

Expand Down
4 changes: 3 additions & 1 deletion tools/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,9 @@ ifeq ($(CONFIG_LIBCXX),y)
else ifeq ($(CONFIG_UCLIBCXX),y)
ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)uClibc++
else
ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)cxx
ifeq ($(CONFIG_LIBMINIABI),y)
ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)cxx
endif
ifeq ($(CONFIG_ETL),y)
ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)etl
endif
Expand Down
Loading