4 files changed, 11 insertions, 6 deletions
diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
index a678eb5c4e4..e01ae95157d 100644
--- a/lldb/cmake/modules/LLDBConfig.cmake
+++ b/lldb/cmake/modules/LLDBConfig.cmake
@@ -24,6 +24,7 @@ endif ()
 set(LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION ${LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION} CACHE BOOL
   "Enables using new Python scripts for SWIG API generation .")  
 
+set(LLDB_PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
 set(LLDB_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/source")
 set(LLDB_INCLUDE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt
index 93ed716e5f1..372c38e6bcd 100644
--- a/lldb/source/CMakeLists.txt
+++ b/lldb/source/CMakeLists.txt
@@ -38,7 +38,12 @@ add_subdirectory(Symbol)
 add_subdirectory(Target)
 add_subdirectory(Utility)
 
-include(../cmake/LLDBDependencies.cmake)
+include(${LLDB_PROJECT_ROOT}/cmake/LLDBDependencies.cmake)
+
+add_lldb_library(lldbBase STATIC
+  lldb.cpp
+  lldb-log.cpp
+  )
 
 add_lldb_library(liblldb SHARED
   lldb.cpp
diff --git a/lldb/unittests/CMakeLists.txt b/lldb/unittests/CMakeLists.txt
index e9b37700a85..68999045c14 100644
--- a/lldb/unittests/CMakeLists.txt
+++ b/lldb/unittests/CMakeLists.txt
@@ -12,10 +12,12 @@ endif ()
 
 # add_lldb_unittest(test_dirname file1.cpp file2.cpp)
 #
-# Will compile the list of files together and link against the liblldb
+# Will compile the list of files together and link against
 function(add_lldb_unittest test_name)
   add_unittest(LLDBUnitTests ${test_name} ${ARGN})
-  target_link_libraries(${test_name} liblldb)
+
+  target_link_libraries(${test_name} lldbBase)
+  target_link_libraries(${test_name} ${LLDB_USED_LIBS})
 endfunction()
 
 add_subdirectory(Host)
diff --git a/lldb/unittests/Host/SocketTest.cpp b/lldb/unittests/Host/SocketTest.cpp
index 26bef353209..a9e14c31c6f 100644
--- a/lldb/unittests/Host/SocketTest.cpp
+++ b/lldb/unittests/Host/SocketTest.cpp
@@ -140,6 +140,3 @@ TEST_F (SocketTest, GetAddress)
     EXPECT_STREQ ("127.0.0.1", socket_a_up->GetRemoteIPAddress ().c_str ());
     EXPECT_STREQ ("127.0.0.1", socket_b_up->GetRemoteIPAddress ().c_str ());
 }
-
-
-