Skip to content

Commit e40e0f8

Browse files
committed
cmake: Add conditional include path for mini ABI support across architectures
This update introduces a conditional check for CONFIG_LIBMINIABI in the platform.cmake files for ARM, ARM64, RISC-V, Tricore, and x86_64 architectures, ensuring that the appropriate include path is added when the mini ABI configuration is enabled. Signed-off-by: Arjav Patel <arjav1528@gmail.com>
1 parent e91a0b8 commit e40e0f8

5 files changed

Lines changed: 15 additions & 0 deletions

File tree

arch/arm/src/cmake/platform.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ endif()
8787

8888
if(CONFIG_LIBCXXTOOLCHAIN)
8989
nuttx_find_toolchain_lib(libstdc++.a)
90+
endif()
91+
92+
if(CONFIG_LIBMINIABI)
9093
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
9194
endif()
9295

arch/arm64/src/cmake/platform.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ endif()
4747

4848
if(CONFIG_LIBCXXTOOLCHAIN)
4949
nuttx_find_toolchain_lib(libstdc++.a)
50+
endif()
51+
52+
if(CONFIG_LIBMINIABI)
5053
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
5154
endif()
5255

arch/risc-v/src/cmake/platform.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ endif()
4949

5050
if(CONFIG_LIBCXXTOOLCHAIN)
5151
nuttx_find_toolchain_lib(libstdc++.a)
52+
endif()
53+
54+
if(CONFIG_LIBMINIABI)
5255
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
5356
endif()
5457

arch/tricore/src/cmake/platform.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ if(CONFIG_TRICORE_TOOLCHAIN_GNU)
4949
endif()
5050
if(CONFIG_LIBCXXTOOLCHAIN)
5151
nuttx_find_toolchain_lib(libstdc++.a)
52+
endif()
53+
54+
if(CONFIG_LIBMINIABI)
5255
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
5356
endif()
5457
if(CONFIG_COVERAGE_TOOLCHAIN)

arch/x86_64/src/cmake/platform.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ endif()
4949

5050
if(CONFIG_LIBCXXTOOLCHAIN)
5151
nuttx_find_toolchain_lib(libstdc++.a)
52+
endif()
53+
54+
if(CONFIG_LIBMINIABI)
5255
list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
5356
endif()
5457

0 commit comments

Comments
 (0)