diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
| commit | ef9bd62c68c2c279926e66058bc5a6ef62150432 (patch) | |
| tree | 247f92a4e885f15dbcd37685fa9dbaa7c1db7c67 /projects | |
| parent | 5868d5c7576d519a0bba685e7a0471ee306f5eee (diff) | |
| parent | 8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f (diff) | |
Merge commit '8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f'
Conflicts:
include/llvm/CodeGen/ISDOpcodes.h
include/llvm/Target/Target.td
include/llvm/Target/TargetLowering.h
include/llvm/Target/TargetOpcodes.h
lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
lib/Target/Mips/MipsMCInstLower.cpp
utils/TableGen/CodeGenTarget.cpp
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index dac637335b..c4567a35b0 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -10,3 +10,11 @@ foreach(entry ${entries}) endif() endif() endforeach(entry) + +# Also add in the compiler-rt tree if present and we have a sufficiently +# recent version of CMake. +if(${CMAKE_VERSION} VERSION_GREATER 2.8.7 AND + IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt AND + EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt/CMakeLists.txt) + add_subdirectory(compiler-rt) +endif() |