[llvm-branch-commits] [lldb] r240421 - fix lldb-gdbserver and lldb-platform linking on RHEL 6

[Tom Stellard]

Author: tstellar
Date: Tue Jun 23 10:40:10 2015
New Revision: 240421

URL: http://llvm.org/viewvc/llvm-project?rev=240421&view=rev
Log:
fix lldb-gdbserver and lldb-platform linking on RHEL 6

This if fix for bug 23774.

Trunk CMake files were changed and fix should be applied to
tools/lldb-server/CMakeLists.txt.

Patch by: Eugene Zelenko

Modified:
    lldb/branches/release_36/tools/lldb-gdbserver/CMakeLists.txt
    lldb/branches/release_36/tools/lldb-platform/CMakeLists.txt

Modified: lldb/branches/release_36/tools/lldb-gdbserver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/tools/lldb-gdbserver/CMakeLists.txt?rev=240421&r1=240420&r2=240421&view=diff
==============================================================================
--- lldb/branches/release_36/tools/lldb-gdbserver/CMakeLists.txt (original)
+++ lldb/branches/release_36/tools/lldb-gdbserver/CMakeLists.txt Tue Jun 23 10:40:10 2015
@@ -28,10 +28,12 @@ add_lldb_executable(lldb-gdbserver
 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})

Modified: lldb/branches/release_36/tools/lldb-platform/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/tools/lldb-platform/CMakeLists.txt?rev=240421&r1=240420&r2=240421&view=diff
==============================================================================
--- lldb/branches/release_36/tools/lldb-platform/CMakeLists.txt (original)
+++ lldb/branches/release_36/tools/lldb-platform/CMakeLists.txt Tue Jun 23 10:40:10 2015
@@ -34,10 +34,12 @@ endif()
 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})