Commit 9db51bac authored Jan 29, 2016 by Hans Wennborg

Merging r259188:

------------------------------------------------------------------------
r259188 | labath | 2016-01-29 03:59:57 -0800 (Fri, 29 Jan 2016) | 17 lines

Fix linking of lldb-server with BUILD_SHARED_LIBS

Summary:
The BUILD_SHARED_LIBS branch of lldb-server link flags was hopelessly broken, at least since we
started restricting the symbols exported by liblldb. lldb-server depends on symbols from the
lldb_private namespace, so it cannot link to the public interface of liblldb. Instead I make it
link to the individual libraries constituting liblldb, just like it does in the
!BUILD_SHARED_LIBS case.

This does not make the BUILD_SHARED_LIBS build of lldb fully functional yet, due to the way
liblldb dependencies are managed, but it's a step in that direction.

Reviewers: zturner, tfiala

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D16678
------------------------------------------------------------------------

llvm-svn: 259241

parent 92b4e31b

lldb/tools/lldb-server/CMakeLists.txt

+11 −16

Original line number	Diff line number	Diff line
		@@ -33,10 +33,6 @@ add_lldb_executable(lldb-server
		LLDBServerUtilities.cpp
		)

		if (BUILD_SHARED_LIBS )
		target_link_libraries(lldb-server liblldb)
		target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})
		else()
		# The Darwin linker doesn't understand --start-group/--end-group.
		if (LLDB_LINKER_SUPPORTS_GROUPS)
		target_link_libraries(lldb-server
		@@ -50,7 +46,6 @@ else()
		llvm_config(lldb-server ${LLVM_LINK_COMPONENTS})

		target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})
		endif()

		set_target_properties(lldb-server PROPERTIES VERSION ${LLDB_VERSION})