commit e87e5342c6236073cb0d28ac43770d72f1fe15f3
author Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com> Thu Dec 22 18:29:08 2022 +0530
committer Joel Goddard <joel.goddard@arm.com> Tue May 23 11:16:10 2023 +0100
tree e3da2e8bb530df1f221e8101b664c161dc893ec8
parent ffd13c31d5e6ff40193b6dd5723dc739a92cf716

Build: GNUARM: fix objcopy command

Set and use ${CMAKE_OBJCOPY} variable for objcopy instead of using
${CROSS_COMPILE}-objcopy. This allows the flexibility of passing the
objcopy path while invoking cmake build command [1].

[1]: For example:
cmake -S . -B cmake_build -DTFM_PLATFORM=arm/rss/rdfremont
-DTFM_TOOLCHAIN_FILE=toolchain_GNUARM.cmake -DCMAKE_BUILD_TYPE=Debug
-DCMAKE_C_COMPILER=<full-path-to>/arm-none-eabi-gcc
-DCMAKE_OBJCOPY=<full-path-to>/arm-none-eabi-objcopy

Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com>
Change-Id: I7578c96fb1fcfbadf71bc005378590af025025b0

toolchain_GNUARM.cmake

diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index dfb2f2e..59d767e 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -333,7 +333,7 @@
     add_custom_command(
         TARGET ${target}
         POST_BUILD
-        COMMAND ${CROSS_COMPILE}-objcopy
+        COMMAND ${CMAKE_OBJCOPY}
         ARGS $<TARGET_FILE:${target}> --wildcard ${STRIP_SYMBOL_KEEP_LIST} --strip-all $<TARGET_FILE_DIR:${target}>/${target}_shared_symbols.axf
     )
 endmacro()
@@ -359,7 +359,7 @@
     add_custom_command(
         TARGET ${target}
         POST_BUILD
-        COMMAND ${CROSS_COMPILE}-objcopy
+        COMMAND ${CMAKE_OBJCOPY}
         ARGS $<TARGET_FILE:${target}> --wildcard ${SYMBOL_LIST} $<TARGET_FILE:${target}>
     )
 endmacro()
@@ -371,7 +371,7 @@
     add_custom_command(
         TARGET ${target}
         PRE_LINK
-        COMMAND ${CROSS_COMPILE}-objcopy
+        COMMAND ${CMAKE_OBJCOPY}
         ARGS $<TARGET_FILE:${dependency}> --wildcard ${SYMBOL_LIST} $<TARGET_FILE:${dependency}>
     )
 endmacro()
@@ -383,7 +383,7 @@
     add_custom_command(
         TARGET ${target}
         POST_BUILD
-        COMMAND ${CROSS_COMPILE}-objcopy
+        COMMAND ${CMAKE_OBJCOPY}
         ARGS $<TARGET_FILE:${target}> --wildcard ${SYMBOL_LIST} $<TARGET_FILE:${target}>
     )
 endmacro()
@@ -395,7 +395,7 @@
     add_custom_command(
         TARGET ${target}
         PRE_LINK
-        COMMAND ${CROSS_COMPILE}-objcopy
+        COMMAND ${CMAKE_OBJCOPY}
         ARGS $<TARGET_FILE:${dependency}> --wildcard ${SYMBOL_LIST} $<TARGET_FILE:${dependency}>
     )
 endmacro()