From 6191d4059f7e37b030803f4901e5d45c061f5669 Mon Sep 17 00:00:00 2001 From: Oleg Kokorin Date: Sun, 16 Nov 2025 14:07:21 +0100 Subject: [PATCH] fix cmake exports to fix linker issue and support TOOLCHAIN_PATH Signed-off-by: Oleg Kokorin --- tools/export/cmake/CMakeLists.txt.tmpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/export/cmake/CMakeLists.txt.tmpl b/tools/export/cmake/CMakeLists.txt.tmpl index f2894e9bffc..6db30770ebd 100644 --- a/tools/export/cmake/CMakeLists.txt.tmpl +++ b/tools/export/cmake/CMakeLists.txt.tmpl @@ -12,10 +12,11 @@ SET(CMAKE_C_COMPILER_WORKS TRUE) SET(CMAKE_CXX_COMPILER_WORKS TRUE) # force cmake compilers -SET(CMAKE_ASM_COMPILER "{{asm}}") -SET(CMAKE_C_COMPILER "{{cc}}") -SET(CMAKE_CXX_COMPILER "{{cxx}}") -SET(ELF2BIN "{{elf2bin}}") +SET(CMAKE_ASM_COMPILER "${TOOLCHAIN_PATH}/{{asm}}") +SET(CMAKE_C_COMPILER "${TOOLCHAIN_PATH}/{{cc}}") +SET(CMAKE_CXX_COMPILER "${TOOLCHAIN_PATH}/{{cxx}}") +SET(CMAKE_CPP_COMPILER "${TOOLCHAIN_PATH}/{{pp}}") +SET(ELF2BIN "${TOOLCHAIN_PATH}/{{elf2bin}}") {% if hex_files %} SET(SREC_CAT "srec_cat") {%- endif %} @@ -60,7 +61,7 @@ TARGET_LINK_LIBRARIES({{name}} {{ld_sys_libs|join(" ")}}) {% if pp -%} add_custom_command(TARGET {{name}} PRE_LINK - COMMAND "{{pp}}" {{pp_flags}} {{linker_script}} -o ${CMAKE_CURRENT_BINARY_DIR}/{{name}}_pp.link_script.ld + COMMAND "${CMAKE_CPP_COMPILER}" {{pp_flags}} {{linker_script}} -o ${CMAKE_CURRENT_BINARY_DIR}/{{name}}_pp.link_script.ld WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/{{name}}_pp.link_script.ld" )