commit 053923e8f595ef8c2ffe901ce7114a98f9a9c0c5
author Anubhav Raina <anubhav.raina@arm.com> Thu Jul 11 11:57:49 2024 +0100
committer Antonio de Angelis <Antonio.deAngelis@arm.com> Mon Jul 15 13:25:13 2024 +0200
tree 5887e1963262b5949f7f340a3e39cf42b64f3d1c
parent 8a5d3b10d40e3d8e46099f60496622a9b0abf58c

Build: fix build dependencies when sharing symbols

When a target is linked against code provided by a symbol provider we
need to ensure

- the symbol provider is built before generating the symbol share
- the symbol share is generated before the target
- the target is linked again when the symbol provider is updated

Change-Id: I4808ca0024c875270ad0683e9709d3db97de714b
Signed-off-by: Anubhav Raina <anubhav.raina@arm.com>

toolchain_GNUARM.cmake

diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 2c52c99..99f2324 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -344,11 +344,19 @@
 
     list(TRANSFORM STRIP_SYMBOL_KEEP_LIST PREPEND  --keep-symbol=)
     # strip all the symbols except those proveded as arguments
-    add_custom_command(
-        TARGET ${target}
-        POST_BUILD
+    add_custom_target(${target}_shared_symbols
         COMMAND ${CMAKE_OBJCOPY}
-        ARGS $<TARGET_FILE:${target}> --wildcard ${STRIP_SYMBOL_KEEP_LIST} --strip-all $<TARGET_FILE_DIR:${target}>/${target}${CODE_SHARING_OUTPUT_FILE_SUFFIX}
+            $<TARGET_FILE:${target}>
+            --wildcard ${STRIP_SYMBOL_KEEP_LIST}
+            --strip-all
+            $<TARGET_FILE_DIR:${target}>/${target}${CODE_SHARING_OUTPUT_FILE_SUFFIX}
+    )
+
+    # Ensure ${target} is built before $<TARGET_FILE:${target}> is used to generate ${target}_shared_symbols
+    add_dependencies(${target}_shared_symbols ${target})
+    # Allow the global clean target to rm the ${target}_shared_symbols created
+    set_target_properties(${target}_shared_symbols PROPERTIES
+        ADDITIONAL_CLEAN_FILES $<TARGET_FILE_DIR:${target}>/${target}${CODE_SHARING_OUTPUT_FILE_SUFFIX}
     )
 endmacro()
 
@@ -361,7 +369,11 @@
             endif()
         endif()
 
-        add_dependencies(${target} ${symbol_provider})
+        # Ensure ${symbol_provider}_shared_symbols is built before ${target}
+        add_dependencies(${target} ${symbol_provider}_shared_symbols)
+        # ${symbol_provider}_shared_symbols - a custom target is always considered out-of-date
+        # To only link when necessary, depend on ${symbol_provider} instead
+        set_property(TARGET ${target} APPEND PROPERTY LINK_DEPENDS $<TARGET_OBJECTS:${symbol_provider}>)
         target_link_options(${target} PRIVATE LINKER:-R$<TARGET_FILE_DIR:${symbol_provider}>/${symbol_provider}${CODE_SHARING_INPUT_FILE_SUFFIX})
     endforeach()
 endmacro()