michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: xcc: prioritize board-specific toolchain version

Browse Source 
Change the toolchain version resolution order to check for
board-specific TOOLCHAIN_VER_${NORMALIZED_BOARD_TARGET} first,
falling back to the generic TOOLCHAIN_VER if not defined.

Now if we want to use various boards lots of them uses same version
but fewer ones differ. We won't have to define TOOLCHAIN_VER for
every board.

Signed-off-by: Anil Ozrenk <anil.ozrenk@analog.com>
This commit is contained in:
Anil Ozrenk
2025-12-19 10:39:18 +03:00
committed by Anas Nashif
parent 5a06cbdf82
commit 565bb11549
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/toolchain/xcc/common.cmake
View File

@@ -7,16 +7,9 @@ if(NOT EXISTS ${XTENSA_TOOLCHAIN_PATH})
message(FATAL_ERROR "Nothing found at XTENSA_TOOLCHAIN_PATH: '${XTENSA_TOOLCHAIN_PATH}'")
endif()
zephyr_get(TOOLCHAIN_VER)
if(DEFINED TOOLCHAIN_VER)
set(XTENSA_TOOLCHAIN_VER ${TOOLCHAIN_VER})
else()
zephyr_get(TOOLCHAIN_VER_${NORMALIZED_BOARD_TARGET})
if(DEFINED TOOLCHAIN_VER_${NORMALIZED_BOARD_TARGET})
set(XTENSA_TOOLCHAIN_VER ${TOOLCHAIN_VER_${NORMALIZED_BOARD_TARGET}})
else()
message(FATAL "Environment variable TOOLCHAIN_VER must be set or given as -DTOOLCHAIN_VER=<var>")
endif()
zephyr_get(XTENSA_TOOLCHAIN_VER VAR TOOLCHAIN_VER_${NORMALIZED_BOARD_TARGET} TOOLCHAIN_VER)
if(NOT DEFINED XTENSA_TOOLCHAIN_VER)
message(FATAL "Environment variable TOOLCHAIN_VER must be set or given as -DTOOLCHAIN_VER=<var>")
endif()
zephyr_get(XTENSA_CORE_${NORMALIZED_BOARD_TARGET})