diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-09-25 17:30:25 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-09-25 18:01:23 -0700 |
| commit | a27c28b1427dc2082ab2b31efdbb25f9fde31b61 (patch) | |
| tree | 6f3ff025f542ca3f66a1a01cbf239aeef7784511 /projects | |
| parent | 0e15ffd8cb1ec642eddb96380660914ff2b007e1 (diff) | |
| parent | bc4021f31eaa97ee52655828da3e3de14a39e4a6 (diff) | |
Merge commit 'bc4021f31eaa97ee52655828da3e3de14a39e4a6'
Conflicts:
lib/MC/MCAssembler.cpp
lib/Target/ARM/ARMISelDAGToDAG.cpp
lib/Target/Mips/MipsInstrFPU.td
lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
lib/Target/X86/X86ISelLowering.h
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index c4567a35b0..a9d2af6ad2 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -14,6 +14,7 @@ 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 + ${LLVM_BUILD_RUNTIME} AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt/CMakeLists.txt) add_subdirectory(compiler-rt) |