Build: Generalise dependency on manifest_tool
The manifest_tool target generates PSA interface based on TF-M configuration.
Some modules use that API during TF-M build so in a heavy-loaded
parallel build environment that API might not be ready yet as it was in
the case of scatter files. This change generalises the dependency.
Signed-off-by: Anton Komlev <anton.komlev@arm.com>
Change-Id: I68b0e829f8a2d054cd5b845fd647adb8d6f94829
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 97711e8..095450a 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -41,6 +41,8 @@
$<$<BOOL:${TEST_NS_MULTI_CORE}>:TFM_MULTI_CORE_TEST>
)
+add_dependencies(psa_interface manifest_tool)
+
###################### PSA api (S lib) #########################################
target_sources(tfm_sprt
diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index 7791982..cc0ac19 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -291,11 +291,6 @@
-E
-xc
)
-
- # Scatter file shall be preprocessed by manifest tool in isolation level 2,3
- add_dependencies(${target}_scatter
- manifest_tool
- )
endmacro()
macro(add_convert_to_bin_target target)
diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 9d3ae09..689f959 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -257,11 +257,6 @@
PRIVATE
$<$<NOT:$<BOOL:${CONFIG_GNU_LINKER_READONLY_ATTRIBUTE}>>:READONLY=>
)
-
- # Scatter file shall be preprocessed by manifest tool in isolation level 2,3
- add_dependencies(${target}_scatter
- manifest_tool
- )
endmacro()
macro(add_convert_to_bin_target target)
diff --git a/toolchain_IARARM.cmake b/toolchain_IARARM.cmake
index bf0f35f..1e8c4a4 100644
--- a/toolchain_IARARM.cmake
+++ b/toolchain_IARARM.cmake
@@ -211,11 +211,6 @@
PRIVATE
--preprocess=sn $<TARGET_OBJECTS:${target}_scatter>
)
-
- # Scatter file shall be preprocessed by manifest tool in isolation level 2,3
- add_dependencies(${target}_scatter
- manifest_tool
- )
endmacro()
macro(add_convert_to_bin_target target)