This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 20e03f50cf toolchain/tasking: fix build break on tasking toolchain
20e03f50cf is described below
commit 20e03f50cf011b919c2d80dabc46c73703ba966f
Author: chao an <[email protected]>
AuthorDate: Tue Oct 29 15:39:38 2024 +0800
toolchain/tasking: fix build break on tasking toolchain
1. Tasking only support preprocess link script on linker phase
2. Remove executable suffix (.elf)
Signed-off-by: chao an <[email protected]>
---
CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4edfa57f76..35ff09df1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -579,7 +579,7 @@ endif()
get_property(ldscript GLOBAL PROPERTY LD_SCRIPT)
# Pre-compile linker script
-if(NOT CONFIG_ARCH_SIM)
+if(NOT CONFIG_ARCH_SIM AND NOT CONFIG_ARCH_TOOLCHAIN_TASKING)
get_filename_component(LD_SCRIPT_NAME ${ldscript} NAME)
set(LD_SCRIPT_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_NAME}.tmp")
@@ -623,6 +623,8 @@ if(NOT CONFIG_ARCH_SIM)
# TODO: nostart/nodefault not applicable to nuttx toolchain
if(CONFIG_ARCH_TOOLCHAIN_TASKING)
target_link_libraries(nuttx PRIVATE --lsl-file=${ldscript} ${nuttx_libs})
+ # Remove executable suffix
+ set(CMAKE_EXECUTABLE_SUFFIX "")
else()
target_link_libraries(
nuttx
