Skip to content

Commit c57baee

Browse files
nashifgalak
authored andcommitted
xtensa: use SOC_TOOLCHAIN_NAME instead of SOC_NAME
The toolchain variant is not always the same as the SoC name, so set this based on what the SoC defines instead. Also see zephyrproject-rtos/zephyr#29664 Signed-off-by: Anas Nashif <[email protected]>
1 parent 833eb27 commit c57baee

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/zephyr/target.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ set(CROSS_COMPILE_TARGET ${CROSS_COMPILE_TARGET_${ARCH}})
1616
set(SYSROOT_TARGET ${CROSS_COMPILE_TARGET})
1717

1818
if("${ARCH}" STREQUAL "xtensa")
19-
set(SYSROOT_DIR ${TOOLCHAIN_HOME}/xtensa/${SOC_NAME}/${SYSROOT_TARGET})
20-
set(CROSS_COMPILE ${TOOLCHAIN_HOME}/xtensa/${SOC_NAME}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)
19+
set(SYSROOT_DIR ${TOOLCHAIN_HOME}/xtensa/${SOC_TOOLCHAIN_NAME}/${SYSROOT_TARGET})
20+
set(CROSS_COMPILE ${TOOLCHAIN_HOME}/xtensa/${SOC_TOOLCHAIN_NAME}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)
2121
else()
2222
set(SYSROOT_DIR ${TOOLCHAIN_HOME}/${SYSROOT_TARGET}/${SYSROOT_TARGET})
2323
set(CROSS_COMPILE ${TOOLCHAIN_HOME}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)

0 commit comments

Comments
 (0)