diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2018-10-16 16:42:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 16:42:07 -0700 |
| commit | 5c2c5961a6142fc0bf0c9f992ff76b4a32ad65e4 (patch) | |
| tree | 52676844f336fc89dbeb77c4c5cf5a64ad020d82 /src/ToolBox | |
| parent | 116461030e106f14d7fc53a2143930db21d6eaa6 (diff) | |
| download | coreclr-5c2c5961a6142fc0bf0c9f992ff76b4a32ad65e4.tar.gz coreclr-5c2c5961a6142fc0bf0c9f992ff76b4a32ad65e4.tar.bz2 coreclr-5c2c5961a6142fc0bf0c9f992ff76b4a32ad65e4.zip | |
Enable building with Clang 7 (#20417)
The Clang 7 is the first version in which only the major version is used in
file names and paths. So the change needed to massage the build files a bit
more than what was needed for the previous versions.
Diffstat (limited to 'src/ToolBox')
| -rw-r--r-- | src/ToolBox/SOS/lldbplugin/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt index 96aec3019b..623d6153b3 100644 --- a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt +++ b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt @@ -66,8 +66,8 @@ if(NOT $ENV{LLDB_LIB} STREQUAL "") else() # Check for LLDB library if(CLR_CMAKE_PLATFORM_DARWIN) - find_library(LLDB_LIB NAMES LLDB lldb lldb-6.0 lldb-5.0 lldb-4.0 lldb-3.9 lldb-3.8 lldb-3.7 lldb-3.6 lldb-3.5 PATHS "${WITH_LLDB_LIBS}" PATH_SUFFIXES llvm NO_DEFAULT_PATH) - find_library(LLDB_LIB NAMES LLDB lldb lldb-6.0 lldb-5.0 lldb-4.0 lldb-3.9 lldb-3.8 lldb-3.7 lldb-3.6 lldb-3.5 PATH_SUFFIXES llvm) + find_library(LLDB_LIB NAMES LLDB lldb lldb-7 lldb-6.0 lldb-5.0 lldb-4.0 lldb-3.9 lldb-3.8 lldb-3.7 lldb-3.6 lldb-3.5 PATHS "${WITH_LLDB_LIBS}" PATH_SUFFIXES llvm NO_DEFAULT_PATH) + find_library(LLDB_LIB NAMES LLDB lldb lldb-7 lldb-6.0 lldb-5.0 lldb-4.0 lldb-3.9 lldb-3.8 lldb-3.7 lldb-3.6 lldb-3.5 PATH_SUFFIXES llvm) if(LLDB_LIB STREQUAL LLDB_LIB-NOTFOUND) if(REQUIRE_LLDBPLUGIN) set(MESSAGE_MODE FATAL_ERROR) @@ -90,6 +90,7 @@ else() # If the file in a directory is found the result is stored in the variable and the search will not be repeated unless the variable is cleared. find_path(LLDB_H "lldb/API/LLDB.h" PATHS "${WITH_LLDB_INCLUDES}" NO_DEFAULT_PATH) find_path(LLDB_H "lldb/API/LLDB.h") + find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-7/include") find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-6.0/include") find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-5.0/include") find_path(LLDB_H "lldb/API/LLDB.h" PATHS "/usr/lib/llvm-4.0/include") |