[All] Add build-id to Linux binaries (#4711)

gleocadie · web-flow · commit 7e14cde35717 · 2023-10-10T19:20:04.000+02:00
* Add build-id to Linux binaries
* Fix macos build
diff --git a/profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt
@@ -41,6 +41,7 @@ add_library(${API_WRAPPER_SHARED_LIB_NAME} SHARED
 target_link_libraries(${API_WRAPPER_SHARED_LIB_NAME}
     -pthread
     -ldl
+    -Wl,--build-id
 )
 
 set_target_properties(${API_WRAPPER_SHARED_LIB_NAME} PROPERTIES PREFIX "")
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt
@@ -121,6 +121,7 @@ target_link_libraries(${PROFILER_STATIC_LIB_NAME}
     -lstdc++fs
     -pthread
     -ldl
+    -Wl,--build-id
 )
 
 add_dependencies(${PROFILER_STATIC_LIB_NAME} libdatadog-lib libunwind-lib coreclr spdlog-headers PPDB)
diff --git a/shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt b/shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
@@ -178,6 +178,7 @@ elseif(ISLINUX)
         ${CMAKE_DL_LIBS}
         coreclr
         spdlog-headers
+        -Wl,--build-id
     )
 endif()
 
diff --git a/tracer/src/Datadog.Tracer.Native/CMakeLists.txt b/tracer/src/Datadog.Tracer.Native/CMakeLists.txt
@@ -216,6 +216,7 @@ elseif(ISLINUX)
         ${CMAKE_DL_LIBS}
         -static-libgcc
         -static-libstdc++
+        -Wl,--build-id
     )
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ add_library(${API_WRAPPER_SHARED_LIB_NAME} SHARED`
`41`	`41`	`target_link_libraries(${API_WRAPPER_SHARED_LIB_NAME}`
`42`	`42`	`-pthread`
`43`	`43`	`-ldl`
	`44`	`+ -Wl,--build-id`
`44`	`45`	`)`
`45`	`46`
`46`	`47`	`set_target_properties(${API_WRAPPER_SHARED_LIB_NAME} PROPERTIES PREFIX "")`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ target_link_libraries(${PROFILER_STATIC_LIB_NAME}`
`121`	`121`	`-lstdc++fs`
`122`	`122`	`-pthread`
`123`	`123`	`-ldl`
	`124`	`+ -Wl,--build-id`
`124`	`125`	`)`
`125`	`126`
`126`	`127`	`add_dependencies(${PROFILER_STATIC_LIB_NAME} libdatadog-lib libunwind-lib coreclr spdlog-headers PPDB)`