commit 6d987bac9ff6275300bbf308e91e6da428fef93e
author Raef Coles <raef.coles@arm.com> Mon Jul 24 12:06:15 2023 +0100
committer Raef Coles <raef.coles@arm.com> Mon Aug 14 10:38:43 2023 +0100
tree 69d5b13db243df2bd3f802d65d9e598ada04542a
parent cf67cad2418f735edd4a4ac795bbf3e793fe757f

Build: Set CMAKE_OBJCOPY to default value

On ARMCLANG, set to a default value which matches the cross-compile
triple. This can be overridden on the command-line if needed. Update
usage so that ${CMAKE_OBJCOPY} is used instead of
${CROSS_COMPILE}-objcopy.

Change-Id: I2ca1fe2bf8daa567e0ccab508aa153c2586ddca3
Signed-off-by: Raef Coles <raef.coles@arm.com>

toolchain_ARMCLANG.cmake

diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index 6c91503..e6a6a95 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -23,6 +23,10 @@
 # with the Ninja generator.
 set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_LIST_DIR}/cmake/set_extensions.cmake)
 
+if(NOT DEFINED CMAKE_OBJCOPY)
+    set(CMAKE_OBJCOPY ${CROSS_COMPILE}-objcopy CACHE FILEPATH "Path to objcopy")
+endif()
+
 macro(tfm_toolchain_reset_compiler_flags)
     set_property(DIRECTORY PROPERTY COMPILE_OPTIONS "")
 
@@ -427,7 +431,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()
@@ -441,7 +445,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()
@@ -455,7 +459,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()
@@ -469,7 +473,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()