diff options
| -rw-r--r-- | src/ToolBox/SOS/lldbplugin/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/pal/src/configure.cmake | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt index 5fb5f62a05..614e9827b0 100644 --- a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt +++ b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt @@ -8,10 +8,9 @@ if((NOT $ENV{LLDB_INCLUDE_DIR} STREQUAL "") AND (NOT $ENV{LLDB_LIB_DIR} STREQUAL set(LLDB_LIB_DIR "$ENV{LLDB_LIB_DIR}") elseif(CLR_CMAKE_PLATFORM_LINUX) # The Linux build depends on the lldb-3.5-dev package - # TODO 2/23/15 - temporary until we get the lldb-3.5-dev package installed on the CI machine. - #set(LLVM_DIR "/usr/lib/llvm-3.5") - #set(LLDB_INCLUDE_DIR "${LLVM_DIR}/include") - #set(LLDB_LIB_DIR "${LLVM_DIR}/lib") + set(LLVM_DIR "/usr/lib/llvm-3.5") + set(LLDB_INCLUDE_DIR "${LLVM_DIR}/include") + set(LLDB_LIB_DIR "${LLVM_DIR}/lib") endif() if((NOT ${LLDB_INCLUDE_DIR} STREQUAL "") AND (NOT ${LLDB_LIB_DIR} STREQUAL "")) diff --git a/src/pal/src/configure.cmake b/src/pal/src/configure.cmake index 972d6add36..b10342d0be 100644 --- a/src/pal/src/configure.cmake +++ b/src/pal/src/configure.cmake @@ -18,6 +18,7 @@ check_include_files(sys/time.h HAVE_SYS_TIME_H) check_include_files(pthread_np.h HAVE_PTHREAD_NP_H) check_include_files(sys/lwp.h HAVE_SYS_LWP_H) check_include_files(libunwind.h HAVE_LIBUNWIND_H) +check_include_files(/usr/lib/llvm-3.5/include/lldb/API/LLDB.h HAVE_LLDB_H) check_function_exists(kqueue HAVE_KQUEUE) check_function_exists(getpwuid_r HAVE_GETPWUID_R) @@ -858,6 +859,10 @@ else() unset(HAVE_LIBUNWIND_H CACHE) message(FATAL_ERROR "Cannot find libunwind. Try installing libunwind8 and libunwind8-dev (or the appropriate packages for your platform)") endif() + if(NOT HAVE_LLDB_H) + unset(HAVE_LLDB_H CACHE) + message(FATAL_ERROR "Cannot find LLDB.h. Try installing lldb-3.5-dev (or the appropriate packages for your platform)") + endif() set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 0) set(PAL_PTRACE "ptrace((cmd), (pid), (void*)(addr), (data))") set(PAL_PT_ATTACH PTRACE_ATTACH) |