diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
index d08b281e8..12cf46be2 100644
--- a/renderdoc/CMakeLists.txt
+++ b/renderdoc/CMakeLists.txt
@@ -545,6 +545,10 @@ if(UNIX AND NOT ANDROID AND NOT APPLE)
         set(RDOC_LINK_FLAGS "${RDOC_LINK_FLAGS} -Wl,--no-undefined")
     endif()
 
+    if(ENABLE_GGP)
+        set(RDOC_LINK_FLAGS "${RDOC_LINK_FLAGS} -Wl,--hash-style=gnu -Wl,--build-id=sha1")
+    endif()
+
     set_target_properties(renderdoc PROPERTIES LINK_FLAGS "${RDOC_LINK_FLAGS}")
     set_target_properties(renderdoc PROPERTIES SKIP_BUILD_RPATH TRUE)
 endif()
diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
index 2b3ab02e4..23d71f3ac 100644
--- a/renderdoccmd/CMakeLists.txt
+++ b/renderdoccmd/CMakeLists.txt
@@ -22,7 +22,7 @@ elseif(ENABLE_GGP)
     list(APPEND sources renderdoccmd_ggp.cpp)
     find_library(GGP_LIBRARY ggp)
     list(APPEND libraries PRIVATE ${GGP_LIBRARY})
-    set(LINKER_FLAGS "-Wl,--no-as-needed")
+    set(LINKER_FLAGS "-Wl,--no-as-needed -Wl,--hash-style=gnu -Wl,--build-id=sha1")
 elseif(UNIX)
     list(APPEND sources renderdoccmd_linux.cpp)