diff --git a/lldb/tools/lldb-gdbserver/CMakeLists.txt b/lldb/tools/lldb-gdbserver/CMakeLists.txt
index 1dc2e1c..af31400 100644
--- a/lldb/tools/lldb-gdbserver/CMakeLists.txt
+++ b/lldb/tools/lldb-gdbserver/CMakeLists.txt
@@ -28,10 +28,12 @@
 if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
   target_link_libraries(lldb-gdbserver
                         -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
+  target_link_libraries(lldb-gdbserver
+                        -Wl,--start-group ${CLANG_USED_LIBS} -Wl,--end-group)
 else()
   target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
+  target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
 endif()
-target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
 llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
 
 target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
diff --git a/lldb/tools/lldb-platform/CMakeLists.txt b/lldb/tools/lldb-platform/CMakeLists.txt
index d4a1e0a..f184a5f 100644
--- a/lldb/tools/lldb-platform/CMakeLists.txt
+++ b/lldb/tools/lldb-platform/CMakeLists.txt
@@ -34,10 +34,12 @@
 if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
   target_link_libraries(lldb-platform
                         -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
+  target_link_libraries(lldb-platform
+                        -Wl,--start-group ${CLANG_USED_LIBS} -Wl,--end-group)
 else()
   target_link_libraries(lldb-platform ${LLDB_USED_LIBS})
+  target_link_libraries(lldb-platform ${CLANG_USED_LIBS})
 endif()
-target_link_libraries(lldb-platform ${CLANG_USED_LIBS})
 llvm_config(lldb-platform ${LLVM_LINK_COMPONENTS})
 
 target_link_libraries(lldb-platform ${LLDB_SYSTEM_LIBS})