From 7f407476f9c5f648bb2e1452ac623da33032278c Mon Sep 17 00:00:00 2001 From: wangchengdong Date: Tue, 16 Sep 2025 20:17:16 +0800 Subject: [PATCH] nuttx/cmake: improve board specific Toolchain.cmake remove limitation that only custom board can have board specific Toolchain.cmake Signed-off-by: Chengdong Wang --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c575829a6e..0d5bcdebae0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -447,13 +447,11 @@ endif() # Setup platform options (this needs to happen after project(), once the # toolchain file has been processed) -# Support custom Toolchain options by custom Boards -if(CONFIG_ARCH_BOARD_CUSTOM) - if(EXISTS ${NUTTX_BOARD_ABS_DIR}/cmake - AND EXISTS ${NUTTX_BOARD_ABS_DIR}/cmake/Toolchain.cmake) - # must be added AFTER ToolchainFile and BEFORE platform - include(${NUTTX_BOARD_ABS_DIR}/cmake/Toolchain.cmake) - endif() +# Support board Toolchain options +if(EXISTS ${NUTTX_BOARD_ABS_DIR}/cmake + AND EXISTS ${NUTTX_BOARD_ABS_DIR}/cmake/Toolchain.cmake) + # must be added AFTER ToolchainFile and BEFORE platform + include(${NUTTX_BOARD_ABS_DIR}/cmake/Toolchain.cmake) endif() include(platform)