Index: source/Core/CMakeLists.txt
===================================================================
--- source/Core/CMakeLists.txt
+++ source/Core/CMakeLists.txt
@@ -1,3 +1,5 @@
+include(${LLDB_PROJECT_ROOT}/cmake/LLDBDependencies.cmake)
+
 add_lldb_library(lldbCore
   Address.cpp
   AddressRange.cpp
@@ -65,6 +67,7 @@
     lldbPluginCPlusPlusLanguage
     lldbPluginObjCLanguage
     lldbPluginObjectFileJIT
+    ${LLDB_SYSTEM_LIBS}
 
   LINK_COMPONENTS
     Support
Index: source/Host/CMakeLists.txt
===================================================================
--- source/Host/CMakeLists.txt
+++ source/Host/CMakeLists.txt
@@ -48,6 +48,7 @@
   add_host_subdirectory(common
     common/Editline.cpp
     )
+  list(APPEND EXTRA_LIBS edit)
 endif()
 
 add_host_subdirectory(posix
@@ -160,12 +161,12 @@
 endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
- set(EXTRA_LIBS kvm)
+ list(APPEND EXTRA_LIBS kvm)
 endif ()
 
 add_lldb_library(lldbHost
   ${HOST_SOURCES}
-  
+
   LINK_LIBS
     lldbCore
     lldbInterpreter
@@ -174,7 +175,8 @@
     lldbUtility
     ${LLDB_PLUGINS}
     ${EXTRA_LIBS}
-  
+
   LINK_COMPONENTS
     Support
   )
+