lldb-platform - switch to static linking (like lldb-gdbserver)

[ovyalov]

Looks good.

[zturner]

cmake/LLDBDependencies.cmake

148–150

Looks like this won't work on Windows. Is there a cross-platform way to ask for all the system libraries? Also should you be using ${PYTHON_LIBRARIES} instead of python2.7?

Also, where is this set? I don't see it being set in the CMakeLists.txt file for building lldb-platform, so how does this fit in with the lldb-platform changes?

[vharron]

Sorry Zach, looking now.

[vharron]

Submitted: 225398

cmake/LLDBDependencies.cmake

 if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" AND NOT __ANDROID_NDK__)
   list(APPEND LLDB_SYSTEM_LIBS edit panel ncurses)
 endif()
 # On FreeBSD backtrace() is provided by libexecinfo, not libc.
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   list(APPEND LLDB_SYSTEM_LIBS execinfo)
 endif()
 
-if (NOT LLDB_DISABLE_PYTHON)
+if (NOT LLDB_DISABLE_PYTHON AND NOT LLVM_BUILD_STATIC)
   list(APPEND LLDB_SYSTEM_LIBS ${PYTHON_LIBRARIES})
 endif()
 
 list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
 
+if (LLVM_BUILD_STATIC)
+  list(APPEND LLDB_SYSTEM_LIBS python2.7 z util termcap gpm ssl crypto bsd)
+endif()
+
 set( LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
   interpreter
   asmparser
   bitreader
   bitwriter
   codegen
   ipo

tools/lldb-platform/CMakeLists.txt

 set(LLVM_NO_RTTI 1)
 
+if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+include_directories(
+  ../../source/Plugins/Process/Linux
+  ../../source/Plugins/Process/POSIX
+  )
+endif ()
+
+if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
+include_directories(
+  ../../source/Plugins/Process/FreeBSD
+  ../../source/Plugins/Process/POSIX
+  )
+endif ()
+
 include_directories(../../source)
 
+include(../../cmake/LLDBDependencies.cmake)
+
 add_lldb_executable(lldb-platform
   lldb-platform.cpp
+  ../../source/lldb-log.cpp
+  ../../source/lldb.cpp
   )
 
-target_link_libraries(lldb-platform liblldb)
+# The Darwin linker doesn't understand --start-group/--end-group.
+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)
+else()
+  target_link_libraries(lldb-platform ${LLDB_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})
 
 set_target_properties(lldb-platform PROPERTIES VERSION ${LLDB_VERSION})
 
 install(TARGETS lldb-platform
   RUNTIME DESTINATION bin)