commit 1a10355d683ea2626c77c1c9ade4cd5026cf148a
author Anton Komlev <anton.komlev@arm.com> Fri Feb 11 15:40:26 2022 +0000
committer Anton Komlev <Anton.Komlev@arm.com> Wed Feb 16 23:29:06 2022 +0100
tree c4a33d61a190848d793d1ce11e1cabb31671bc28
parent b932f22c2437dd1b8fd71fb91741b118074f1f43

build: Fix dependency of output binaries on linker script

A linker script (scatter file) modification does not cause the
output binaries (tfm_s.axf, tfm_ns.axf) rebuild

Signed-off-by: Anton Komlev <anton.komlev@arm.com>
Change-Id: I3c4d1923ba166053e26835724a306cdf09705aec

toolchain_ARMCLANG.cmake

diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index dfe5f4b..f21fb0b 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -236,10 +236,6 @@
         --scatter=$<TARGET_OBJECTS:${target}_scatter>
     )
 
-    add_dependencies(${target}
-        ${target}_scatter
-    )
-
     add_library(${target}_scatter OBJECT)
     foreach(scatter_file ${ARGN})
         target_sources(${target}_scatter
@@ -257,6 +253,12 @@
         )
     endforeach()
 
+    add_dependencies(${target}
+        ${target}_scatter
+    )
+
+    set_target_properties(${target} PROPERTIES LINK_DEPENDS $<TARGET_OBJECTS:${target}_scatter>)
+
     target_link_libraries(${target}_scatter
         platform_region_defs
         psa_interface