Fix: make platform-inspect compiler independent
Platform-inspect used a compiler specific method to fix link order issue
between t_cose and qcbor. Remove the "-Wl,--start-group" linker option
and use correct link order instead.
Change-Id: I690ce3ed2b3bb3c456ece28562986fa213e94262
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
diff --git a/deployments/platform-inspect/arm-linux/CMakeLists.txt b/deployments/platform-inspect/arm-linux/CMakeLists.txt
index 0f41586..416bd65 100644
--- a/deployments/platform-inspect/arm-linux/CMakeLists.txt
+++ b/deployments/platform-inspect/arm-linux/CMakeLists.txt
@@ -34,11 +34,3 @@
#
#-------------------------------------------------------------------------------
target_link_libraries(platform-inspect PRIVATE stdc++ gcc m)
-
-#-------------------------------------------------------------------------------
-# Linker option to enable repeated searches for undefined references.
-# Required to resolve dependencies between t_cose and qcbor libraries.
-#-------------------------------------------------------------------------------
-target_link_options(platform-inspect PRIVATE
- -Wl,--start-group
- )
diff --git a/deployments/platform-inspect/platform-inspect.cmake b/deployments/platform-inspect/platform-inspect.cmake
index b1b316d..01328b6 100644
--- a/deployments/platform-inspect/platform-inspect.cmake
+++ b/deployments/platform-inspect/platform-inspect.cmake
@@ -54,11 +54,12 @@
# Qcbor
include(${TS_ROOT}/external/qcbor/qcbor.cmake)
-target_link_libraries(platform-inspect PRIVATE qcbor)
# t_cose
include(${TS_ROOT}/external/t_cose/t_cose.cmake)
-target_link_libraries(platform-inspect PRIVATE t_cose)
+# Ensure correct order of libraries on the command line of LD. t_cose depends on qcbor thus
+# qcbor must come later.
+target_link_libraries(platform-inspect PRIVATE t_cose qcbor)
#-------------------------------------------------------------------------------
# Define install content.