From deed71387f52ec80feb8fe23f0c1ab580288fa1b Mon Sep 17 00:00:00 2001
From: Tom Stellard <thomas.stellard@amd.com>
Date: Tue, 23 Jun 2015 15:40:10 +0000
Subject: [PATCH] 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
llvm-svn: 240421
---
lldb/tools/lldb-gdbserver/CMakeLists.txt | 4 +++-
lldb/tools/lldb-platform/CMakeLists.txt | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lldb/tools/lldb-gdbserver/CMakeLists.txt b/lldb/tools/lldb-gdbserver/CMakeLists.txt
index 1dc2e1c373fd..af314007755f 100644
--- a/lldb/tools/lldb-gdbserver/CMakeLists.txt
+++ b/lldb/tools/lldb-gdbserver/CMakeLists.txt
@@ -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})
diff --git a/lldb/tools/lldb-platform/CMakeLists.txt b/lldb/tools/lldb-platform/CMakeLists.txt
index d4a1e0a88e1f..f184a5f94698 100644
--- a/lldb/tools/lldb-platform/CMakeLists.txt
+++ b/lldb/tools/lldb-platform/CMakeLists.txt
@@ -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})
--
GitLab