Index: lldb-3.6.0.src/source/lldb.cpp
===================================================================
--- lldb-3.6.0.src.orig/source/lldb.cpp
+++ lldb-3.6.0.src/source/lldb.cpp
@@ -325,11 +325,7 @@ extern "C" const unsigned char liblldb_c
 static const char *
 GetLLDBRevision()
 {
-#ifdef LLDB_REVISION
     return LLDB_REVISION;
-#else
-    return NULL;
-#endif
 }
 
 static const char *
Index: lldb-3.6.0.src/source/Core/IOHandler.cpp
===================================================================
--- lldb-3.6.0.src.orig/source/Core/IOHandler.cpp
+++ lldb-3.6.0.src/source/Core/IOHandler.cpp
@@ -31,8 +31,8 @@
 #include "lldb/Target/ThreadPlan.h"
 
 #ifndef LLDB_DISABLE_CURSES
-#include <ncurses.h>
-#include <panel.h>
+#include <ncurses/ncurses.h>
+#include <ncurses/panel.h>
 #endif
 
 using namespace lldb;
Index: lldb-3.6.0.src/CMakeLists.txt
===================================================================
--- lldb-3.6.0.src.orig/CMakeLists.txt
+++ lldb-3.6.0.src/CMakeLists.txt
@@ -83,7 +83,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
 
   # Import CMake library targets from LLVM and Clang.
   include("${LLDB_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
-  include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
+  # include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
 
   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
 
Index: lldb-3.6.0.src/cmake/LLDBDependencies.cmake
===================================================================
--- lldb-3.6.0.src.orig/cmake/LLDBDependencies.cmake
+++ lldb-3.6.0.src/cmake/LLDBDependencies.cmake
@@ -132,7 +132,7 @@ set( CLANG_USED_LIBS
 
 set(LLDB_SYSTEM_LIBS)
 if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" AND NOT __ANDROID_NDK__)
-  list(APPEND LLDB_SYSTEM_LIBS edit panel ncurses)
+  list(APPEND LLDB_SYSTEM_LIBS edit panel ncurses dl pthread)
 endif()
 # On FreeBSD backtrace() is provided by libexecinfo, not libc.
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
@@ -165,6 +165,8 @@ set( LLVM_LINK_COMPONENTS
   mcdisassembler
   executionengine
   option
+  support
+  runtimedyld
   )
 
 if ( NOT LLDB_DISABLE_PYTHON )