Skip to content

Commit

Permalink
Enable libcxx as part of the top level CMake build when it is checked
Browse files Browse the repository at this point in the history
out in projects. This appears to be working on my system, and I will be
watching build bots to see if there are any issues on other platforms.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191624 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
chandlerc committed Sep 28, 2013
1 parent 3f4f420 commit 2f101e8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions projects/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ foreach(entry ${entries})
endif()
endforeach(entry)

# Also add in the compiler-rt tree if present and we have a sufficiently
# recent version of CMake.
# Also add in libc++ and compiler-rt trees if present (and we have
# a sufficiently recent version of CMake where required).
if(${LLVM_BUILD_RUNTIME})
add_llvm_external_project(libcxx)
if(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
add_llvm_external_project(compiler-rt)
else()
Expand Down

0 comments on commit 2f101e8

Please sign in to comment.