Index: cmake/LLDBDependencies.cmake
===================================================================
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -169,6 +169,7 @@
   core
   mcdisassembler
   executionengine
+  runtimedyld
   option
   support
   )
Index: cmake/modules/LLDBConfig.cmake
===================================================================
--- cmake/modules/LLDBConfig.cmake
+++ cmake/modules/LLDBConfig.cmake
@@ -219,6 +219,14 @@
 
 endif()
 
+if (HAVE_LIBPTHREAD)
+  list(APPEND system_libs pthread)
+endif(HAVE_LIBPTHREAD)
+
+if (HAVE_LIBDL)
+  list(APPEND system_libs ${CMAKE_DL_LIBS})
+endif()
+
 if(LLDB_REQUIRES_EH)
   set(LLDB_REQUIRES_RTTI ON)
 else()
Index: scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- scripts/Python/finishSwigPythonLLDB.py
+++ scripts/Python/finishSwigPythonLLDB.py
@@ -304,6 +304,8 @@
             # llvm/build/lib/python2.7/site-packages/lldb
             strBuildDir = os.path.join("..", "..", "..", "..");
         strSrc = os.path.normcase(os.path.join(strBuildDir, vstrSrcFile));
+        strTargetDir = os.path.dirname(strTarget);
+        strSrc = os.path.relpath(os.path.abspath(strSrc), strTargetDir);
 
     if eOSType == utilsOsType.EnumOsType.Unknown:
         bOk = False;
@@ -371,6 +373,12 @@
                 strLibFileExtn = ".so";
             strSrc = os.path.join("lib", "liblldb" + strLibFileExtn);
 
+    # Create a symlink to the "lib" directory, to ensure liblldb's RPATH is
+    # effective.
+    bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") );
+    if not bOk:
+        return (bOk, strErrMsg)
+
     bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
 
     return (bOk, strErrMsg);
Index: source/Breakpoint/CMakeLists.txt
===================================================================
--- source/Breakpoint/CMakeLists.txt
+++ source/Breakpoint/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbBreakpoint
+add_lldb_library(lldbBreakpoint STATIC
   Breakpoint.cpp
   BreakpointID.cpp
   BreakpointIDList.cpp
Index: source/CMakeLists.txt
===================================================================
--- source/CMakeLists.txt
+++ source/CMakeLists.txt
@@ -25,7 +25,7 @@
   )
 endif ()
 
-add_lldb_library(lldbBase
+add_lldb_library(lldbBase STATIC
   lldb.cpp
   )
 
Index: source/Commands/CMakeLists.txt
===================================================================
--- source/Commands/CMakeLists.txt
+++ source/Commands/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbCommands
+add_lldb_library(lldbCommands STATIC
   CommandCompletions.cpp
   CommandObjectApropos.cpp
   CommandObjectArgs.cpp
Index: source/Core/CMakeLists.txt
===================================================================
--- source/Core/CMakeLists.txt
+++ source/Core/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbCore
+add_lldb_library(lldbCore STATIC
   Address.cpp
   AddressRange.cpp
   AddressResolver.cpp
Index: source/DataFormatters/CMakeLists.txt
===================================================================
--- source/DataFormatters/CMakeLists.txt
+++ source/DataFormatters/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbDataFormatters
+add_lldb_library(lldbDataFormatters STATIC
   CF.cpp
   Cocoa.cpp
   CoreMedia.cpp
Index: source/Expression/CMakeLists.txt
===================================================================
--- source/Expression/CMakeLists.txt
+++ source/Expression/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbExpression
+add_lldb_library(lldbExpression STATIC
   ASTDumper.cpp
   ASTResultSynthesizer.cpp
   ASTStructExtractor.cpp
Index: source/Host/CMakeLists.txt
===================================================================
--- source/Host/CMakeLists.txt
+++ source/Host/CMakeLists.txt
@@ -130,4 +130,4 @@
   endif()
 endif()
 
-add_lldb_library(lldbHost ${HOST_SOURCES})
+add_lldb_library(lldbHost STATIC ${HOST_SOURCES})
Index: source/Initialization/CMakeLists.txt
===================================================================
--- source/Initialization/CMakeLists.txt
+++ source/Initialization/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbInitialization
+add_lldb_library(lldbInitialization STATIC
   SystemInitializerCommon.cpp
   SystemInitializer.cpp
   SystemLifetimeManager.cpp
Index: source/Interpreter/CMakeLists.txt
===================================================================
--- source/Interpreter/CMakeLists.txt
+++ source/Interpreter/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbInterpreter
+add_lldb_library(lldbInterpreter STATIC
   Args.cpp
   CommandHistory.cpp
   CommandInterpreter.cpp
Index: source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
+++ source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABIMacOSX_arm
+add_lldb_library(lldbPluginABIMacOSX_arm STATIC
   ABIMacOSX_arm.cpp
   )
Index: source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
+++ source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABIMacOSX_arm64
+add_lldb_library(lldbPluginABIMacOSX_arm64 STATIC
   ABIMacOSX_arm64.cpp
   )
Index: source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
+++ source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABIMacOSX_i386
+add_lldb_library(lldbPluginABIMacOSX_i386 STATIC
   ABIMacOSX_i386.cpp
   )
Index: source/Plugins/ABI/SysV-arm/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/SysV-arm/CMakeLists.txt
+++ source/Plugins/ABI/SysV-arm/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABISysV_arm
+add_lldb_library(lldbPluginABISysV_arm STATIC
   ABISysV_arm.cpp
   )
Index: source/Plugins/ABI/SysV-arm64/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/SysV-arm64/CMakeLists.txt
+++ source/Plugins/ABI/SysV-arm64/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABISysV_arm64
+add_lldb_library(lldbPluginABISysV_arm64 STATIC
   ABISysV_arm64.cpp
   )
Index: source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
+++ source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABISysV_hexagon
+add_lldb_library(lldbPluginABISysV_hexagon STATIC
   ABISysV_hexagon.cpp
   )
Index: source/Plugins/ABI/SysV-ppc/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/SysV-ppc/CMakeLists.txt
+++ source/Plugins/ABI/SysV-ppc/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABISysV_ppc
+add_lldb_library(lldbPluginABISysV_ppc STATIC
   ABISysV_ppc.cpp
   )
Index: source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
+++ source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABISysV_ppc64
+add_lldb_library(lldbPluginABISysV_ppc64 STATIC
   ABISysV_ppc64.cpp
   )
Index: source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
===================================================================
--- source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
+++ source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginABISysV_x86_64
+add_lldb_library(lldbPluginABISysV_x86_64 STATIC
   ABISysV_x86_64.cpp
   )
Index: source/Plugins/Disassembler/llvm/CMakeLists.txt
===================================================================
--- source/Plugins/Disassembler/llvm/CMakeLists.txt
+++ source/Plugins/Disassembler/llvm/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginDisassemblerLLVM
+add_lldb_library(lldbPluginDisassemblerLLVM STATIC
   DisassemblerLLVMC.cpp
   )
Index: source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt
===================================================================
--- source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt
+++ source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginDynamicLoaderDarwinKernel
+add_lldb_library(lldbPluginDynamicLoaderDarwinKernel STATIc
   DynamicLoaderDarwinKernel.cpp
   )
Index: source/Plugins/DynamicLoader/Hexagon-DYLD/CMakeLists.txt
===================================================================
--- source/Plugins/DynamicLoader/Hexagon-DYLD/CMakeLists.txt
+++ source/Plugins/DynamicLoader/Hexagon-DYLD/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginDynamicLoaderHexagonDYLD
+add_lldb_library(lldbPluginDynamicLoaderHexagonDYLD STATIC
   HexagonDYLDRendezvous.cpp
   DynamicLoaderHexagonDYLD.cpp
   )
Index: source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
===================================================================
--- source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
+++ source/Plugins/DynamicLoader/MacOSX-DYLD/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginDynamicLoaderMacOSXDYLD
+add_lldb_library(lldbPluginDynamicLoaderMacOSXDYLD STATIC
   DynamicLoaderMacOSXDYLD.cpp
   )
Index: source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
===================================================================
--- source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
+++ source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginDynamicLoaderPosixDYLD
+add_lldb_library(lldbPluginDynamicLoaderPosixDYLD STATIC
   AuxVector.cpp
   DYLDRendezvous.cpp
   DynamicLoaderPOSIXDYLD.cpp
Index: source/Plugins/DynamicLoader/Static/CMakeLists.txt
===================================================================
--- source/Plugins/DynamicLoader/Static/CMakeLists.txt
+++ source/Plugins/DynamicLoader/Static/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginDynamicLoaderStatic
+add_lldb_library(lldbPluginDynamicLoaderStatic STATIC
   DynamicLoaderStatic.cpp
   )
Index: source/Plugins/Instruction/ARM/CMakeLists.txt
===================================================================
--- source/Plugins/Instruction/ARM/CMakeLists.txt
+++ source/Plugins/Instruction/ARM/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginInstructionARM
+add_lldb_library(lldbPluginInstructionARM STATIC
   EmulateInstructionARM.cpp
   EmulationStateARM.cpp
   )
Index: source/Plugins/Instruction/ARM64/CMakeLists.txt
===================================================================
--- source/Plugins/Instruction/ARM64/CMakeLists.txt
+++ source/Plugins/Instruction/ARM64/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginInstructionARM64
+add_lldb_library(lldbPluginInstructionARM64 STATIC
   EmulateInstructionARM64.cpp
   )
Index: source/Plugins/Instruction/MIPS/CMakeLists.txt
===================================================================
--- source/Plugins/Instruction/MIPS/CMakeLists.txt
+++ source/Plugins/Instruction/MIPS/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginInstructionMIPS
+add_lldb_library(lldbPluginInstructionMIPS STATIC
   EmulateInstructionMIPS.cpp
   )
Index: source/Plugins/Instruction/MIPS64/CMakeLists.txt
===================================================================
--- source/Plugins/Instruction/MIPS64/CMakeLists.txt
+++ source/Plugins/Instruction/MIPS64/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginInstructionMIPS64
+add_lldb_library(lldbPluginInstructionMIPS64 STATIC
   EmulateInstructionMIPS64.cpp
   )
Index: source/Plugins/InstrumentationRuntime/AddressSanitizer/CMakeLists.txt
===================================================================
--- source/Plugins/InstrumentationRuntime/AddressSanitizer/CMakeLists.txt
+++ source/Plugins/InstrumentationRuntime/AddressSanitizer/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginInstrumentationRuntimeAddressSanitizer
+add_lldb_library(lldbPluginInstrumentationRuntimeAddressSanitizer STATIC
   AddressSanitizerRuntime.cpp
   )
Index: source/Plugins/JITLoader/GDB/CMakeLists.txt
===================================================================
--- source/Plugins/JITLoader/GDB/CMakeLists.txt
+++ source/Plugins/JITLoader/GDB/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 include_directories(.)
 
-add_lldb_library(lldbPluginJITLoaderGDB
+add_lldb_library(lldbPluginJITLoaderGDB STATIC
   JITLoaderGDB.cpp
   )
 
Index: source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt
===================================================================
--- source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt
+++ source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginCXXItaniumABI
+add_lldb_library(lldbPluginCXXItaniumABI STATIC
   ItaniumABILanguageRuntime.cpp
   )
Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
===================================================================
--- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
+++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginAppleObjCRuntime
+add_lldb_library(lldbPluginAppleObjCRuntime STATIC
   AppleObjCRuntime.cpp
   AppleObjCRuntimeV1.cpp
   AppleObjCRuntimeV2.cpp
Index: source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
===================================================================
--- source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
+++ source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginRenderScriptRuntime
+add_lldb_library(lldbPluginRenderScriptRuntime STATIC
   RenderScriptRuntime.cpp
   )
Index: source/Plugins/MemoryHistory/asan/CMakeLists.txt
===================================================================
--- source/Plugins/MemoryHistory/asan/CMakeLists.txt
+++ source/Plugins/MemoryHistory/asan/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginMemoryHistoryASan
+add_lldb_library(lldbPluginMemoryHistoryASan STATIC
   MemoryHistoryASan.cpp
   )
Index: source/Plugins/ObjectContainer/BSD-Archive/CMakeLists.txt
===================================================================
--- source/Plugins/ObjectContainer/BSD-Archive/CMakeLists.txt
+++ source/Plugins/ObjectContainer/BSD-Archive/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginObjectContainerBSDArchive
+add_lldb_library(lldbPluginObjectContainerBSDArchive STATIC
   ObjectContainerBSDArchive.cpp
   )
Index: source/Plugins/ObjectContainer/Universal-Mach-O/CMakeLists.txt
===================================================================
--- source/Plugins/ObjectContainer/Universal-Mach-O/CMakeLists.txt
+++ source/Plugins/ObjectContainer/Universal-Mach-O/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginObjectContainerMachOArchive
+add_lldb_library(lldbPluginObjectContainerMachOArchive STATIC
   ObjectContainerUniversalMachO.cpp
   )
Index: source/Plugins/ObjectFile/ELF/CMakeLists.txt
===================================================================
--- source/Plugins/ObjectFile/ELF/CMakeLists.txt
+++ source/Plugins/ObjectFile/ELF/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginObjectFileELF
+add_lldb_library(lldbPluginObjectFileELF STATIC
   ELFHeader.cpp
   ObjectFileELF.cpp
   )
Index: source/Plugins/ObjectFile/JIT/CMakeLists.txt
===================================================================
--- source/Plugins/ObjectFile/JIT/CMakeLists.txt
+++ source/Plugins/ObjectFile/JIT/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginObjectFileJIT
+add_lldb_library(lldbPluginObjectFileJIT STATIC
   ObjectFileJIT.cpp
   )
Index: source/Plugins/ObjectFile/Mach-O/CMakeLists.txt
===================================================================
--- source/Plugins/ObjectFile/Mach-O/CMakeLists.txt
+++ source/Plugins/ObjectFile/Mach-O/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginObjectFileMachO
+add_lldb_library(lldbPluginObjectFileMachO STATIC
   ObjectFileMachO.cpp
   )
Index: source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
===================================================================
--- source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
+++ source/Plugins/ObjectFile/PECOFF/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginObjectFilePECOFF
+add_lldb_library(lldbPluginObjectFilePECOFF STATIC
   ObjectFilePECOFF.cpp
   )
Index: source/Plugins/OperatingSystem/Python/CMakeLists.txt
===================================================================
--- source/Plugins/OperatingSystem/Python/CMakeLists.txt
+++ source/Plugins/OperatingSystem/Python/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginOSPython
+add_lldb_library(lldbPluginOSPython STATIC
   OperatingSystemPython.cpp
   )
Index: source/Plugins/Platform/Android/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/Android/CMakeLists.txt
+++ source/Plugins/Platform/Android/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformAndroid
+add_lldb_library(lldbPluginPlatformAndroid STATIC
   AdbClient.cpp
   PlatformAndroid.cpp
   PlatformAndroidRemoteGDBServer.cpp
Index: source/Plugins/Platform/FreeBSD/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/FreeBSD/CMakeLists.txt
+++ source/Plugins/Platform/FreeBSD/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformFreeBSD
+add_lldb_library(lldbPluginPlatformFreeBSD STATIC
   PlatformFreeBSD.cpp
   )
Index: source/Plugins/Platform/Kalimba/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/Kalimba/CMakeLists.txt
+++ source/Plugins/Platform/Kalimba/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformKalimba
+add_lldb_library(lldbPluginPlatformKalimba STATIC
   PlatformKalimba.cpp
   )
Index: source/Plugins/Platform/Linux/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/Linux/CMakeLists.txt
+++ source/Plugins/Platform/Linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformLinux
+add_lldb_library(lldbPluginPlatformLinux STATIC
   PlatformLinux.cpp
   )
Index: source/Plugins/Platform/MacOSX/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/MacOSX/CMakeLists.txt
+++ source/Plugins/Platform/MacOSX/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformMacOSX
+add_lldb_library(lldbPluginPlatformMacOSX STATIC
   PlatformDarwin.cpp
   PlatformDarwinKernel.cpp
   PlatformiOSSimulator.cpp
Index: source/Plugins/Platform/POSIX/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/POSIX/CMakeLists.txt
+++ source/Plugins/Platform/POSIX/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformPOSIX
+add_lldb_library(lldbPluginPlatformPOSIX STATIC
   PlatformPOSIX.cpp
   )
Index: source/Plugins/Platform/Windows/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/Windows/CMakeLists.txt
+++ source/Plugins/Platform/Windows/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformWindows
+add_lldb_library(lldbPluginPlatformWindows STATIC
   PlatformWindows.cpp
   )
Index: source/Plugins/Platform/gdb-server/CMakeLists.txt
===================================================================
--- source/Plugins/Platform/gdb-server/CMakeLists.txt
+++ source/Plugins/Platform/gdb-server/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginPlatformGDB
+add_lldb_library(lldbPluginPlatformGDB STATIC
   PlatformRemoteGDBServer.cpp
   )
Index: source/Plugins/Process/FreeBSD/CMakeLists.txt
===================================================================
--- source/Plugins/Process/FreeBSD/CMakeLists.txt
+++ source/Plugins/Process/FreeBSD/CMakeLists.txt
@@ -4,7 +4,7 @@
 include_directories(../POSIX)
 include_directories(../Utility)
 
-add_lldb_library(lldbPluginProcessFreeBSD
+add_lldb_library(lldbPluginProcessFreeBSD STATIC
   ProcessFreeBSD.cpp
   FreeBSDThread.cpp
   ProcessMonitor.cpp
Index: source/Plugins/Process/Linux/CMakeLists.txt
===================================================================
--- source/Plugins/Process/Linux/CMakeLists.txt
+++ source/Plugins/Process/Linux/CMakeLists.txt
@@ -4,7 +4,7 @@
 include_directories(../POSIX)
 include_directories(../Utility)
 
-add_lldb_library(lldbPluginProcessLinux
+add_lldb_library(lldbPluginProcessLinux STATIC
   LinuxThread.cpp
   NativeProcessLinux.cpp
   NativeRegisterContextLinux.cpp
Index: source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt
+++ source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginProcessMacOSXKernel
+add_lldb_library(lldbPluginProcessMacOSXKernel STATIC
   CommunicationKDP.cpp
   ProcessKDP.cpp
   ProcessKDPLog.cpp
Index: source/Plugins/Process/POSIX/CMakeLists.txt
===================================================================
--- source/Plugins/Process/POSIX/CMakeLists.txt
+++ source/Plugins/Process/POSIX/CMakeLists.txt
@@ -4,7 +4,7 @@
 include_directories(../Linux)
 include_directories(../Utility)
 
-add_lldb_library(lldbPluginProcessPOSIX
+add_lldb_library(lldbPluginProcessPOSIX STATIC
   CrashReason.cpp
   POSIXStopInfo.cpp
   POSIXThread.cpp
Index: source/Plugins/Process/Utility/CMakeLists.txt
===================================================================
--- source/Plugins/Process/Utility/CMakeLists.txt
+++ source/Plugins/Process/Utility/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginProcessUtility
+add_lldb_library(lldbPluginProcessUtility STATIC
   DynamicRegisterInfo.cpp
   FreeBSDSignals.cpp
   HistoryThread.cpp
Index: source/Plugins/Process/elf-core/CMakeLists.txt
===================================================================
--- source/Plugins/Process/elf-core/CMakeLists.txt
+++ source/Plugins/Process/elf-core/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginProcessElfCore
+add_lldb_library(lldbPluginProcessElfCore STATIC
   ProcessElfCore.cpp
   ThreadElfCore.cpp
   RegisterContextPOSIXCore_arm.cpp
Index: source/Plugins/Process/gdb-remote/CMakeLists.txt
===================================================================
--- source/Plugins/Process/gdb-remote/CMakeLists.txt
+++ source/Plugins/Process/gdb-remote/CMakeLists.txt
@@ -4,7 +4,7 @@
   include_directories(${LIBXML2_INCLUDE_DIR})
 endif()
 
-add_lldb_library(lldbPluginProcessGDBRemote
+add_lldb_library(lldbPluginProcessGDBRemote STATIC
   GDBRemoteCommunication.cpp
   GDBRemoteCommunicationClient.cpp
   GDBRemoteCommunicationServer.cpp
@@ -15,4 +15,4 @@
   ProcessGDBRemote.cpp
   ProcessGDBRemoteLog.cpp
   ThreadGDBRemote.cpp
-  )
\ No newline at end of file
+  )
Index: source/Plugins/Process/mach-core/CMakeLists.txt
===================================================================
--- source/Plugins/Process/mach-core/CMakeLists.txt
+++ source/Plugins/Process/mach-core/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginProcessMachCore
+add_lldb_library(lldbPluginProcessMachCore STATIC
   ProcessMachCore.cpp
   ThreadMachCore.cpp
   )
Index: source/Plugins/SymbolFile/DWARF/CMakeLists.txt
===================================================================
--- source/Plugins/SymbolFile/DWARF/CMakeLists.txt
+++ source/Plugins/SymbolFile/DWARF/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginSymbolFileDWARF
+add_lldb_library(lldbPluginSymbolFileDWARF STATIC
   DWARFAbbreviationDeclaration.cpp
   DWARFCompileUnit.cpp
   DWARFDataExtractor.cpp
Index: source/Plugins/SymbolFile/Symtab/CMakeLists.txt
===================================================================
--- source/Plugins/SymbolFile/Symtab/CMakeLists.txt
+++ source/Plugins/SymbolFile/Symtab/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginSymbolFileSymtab
+add_lldb_library(lldbPluginSymbolFileSymtab STATIC
   SymbolFileSymtab.cpp
   )
Index: source/Plugins/SymbolVendor/ELF/CMakeLists.txt
===================================================================
--- source/Plugins/SymbolVendor/ELF/CMakeLists.txt
+++ source/Plugins/SymbolVendor/ELF/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginSymbolVendorELF
+add_lldb_library(lldbPluginSymbolVendorELF STATIC
   SymbolVendorELF.cpp
   )
Index: source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
===================================================================
--- source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
+++ source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
@@ -2,6 +2,6 @@
 
 include_directories(${LIBXML2_INCLUDE_DIR})
 
-add_lldb_library(lldbPluginSymbolVendorMacOSX
+add_lldb_library(lldbPluginSymbolVendorMacOSX STATIC
   SymbolVendorMacOSX.cpp
   )
Index: source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
===================================================================
--- source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
+++ source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
@@ -3,7 +3,7 @@
 # We depend on AppleThreadPlanStepThroughObjCTrampoline.h
 include_directories(../../LanguageRuntime/ObjC/AppleObjCRuntime)
 
-add_lldb_library(lldbPluginSystemRuntimeMacOSX
+add_lldb_library(lldbPluginSystemRuntimeMacOSX STATIC
   AppleGetItemInfoHandler.cpp
   AppleGetPendingItemsHandler.cpp
   AppleGetQueuesHandler.cpp
Index: source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
===================================================================
--- source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
+++ source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginUnwindAssemblyInstEmulation
+add_lldb_library(lldbPluginUnwindAssemblyInstEmulation STATIC
   UnwindAssemblyInstEmulation.cpp
   )
Index: source/Plugins/UnwindAssembly/x86/CMakeLists.txt
===================================================================
--- source/Plugins/UnwindAssembly/x86/CMakeLists.txt
+++ source/Plugins/UnwindAssembly/x86/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbPluginUnwindAssemblyX86
+add_lldb_library(lldbPluginUnwindAssemblyX86 STATIC
   UnwindAssembly-x86.cpp
   )
Index: source/Symbol/CMakeLists.txt
===================================================================
--- source/Symbol/CMakeLists.txt
+++ source/Symbol/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbSymbol
+add_lldb_library(lldbSymbol STATIC
   Block.cpp
   ClangASTContext.cpp
   ClangASTImporter.cpp
Index: source/Target/CMakeLists.txt
===================================================================
--- source/Target/CMakeLists.txt
+++ source/Target/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 include_directories(../Plugins/Process/Utility)
 
-add_lldb_library(lldbTarget
+add_lldb_library(lldbTarget STATIC
   ABI.cpp
   CPPLanguageRuntime.cpp
   ExecutionContext.cpp
Index: source/Utility/CMakeLists.txt
===================================================================
--- source/Utility/CMakeLists.txt
+++ source/Utility/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_lldb_library(lldbUtility
+add_lldb_library(lldbUtility STATIC
   ARM_DWARF_Registers.cpp
   ARM64_DWARF_Registers.cpp
   ConvertEnum.cpp
Index: tools/lldb-server/CMakeLists.txt
===================================================================
--- tools/lldb-server/CMakeLists.txt
+++ tools/lldb-server/CMakeLists.txt
@@ -29,6 +29,9 @@
     )
 
   target_link_libraries(lldb-server liblldb)
+  if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+    target_link_libraries(lldb-server pthread)
+  endif ()
 else()
   add_lldb_executable(lldb-server
     lldb-gdbserver.cpp