summaryrefslogtreecommitdiffstats
path: root/projects
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2013-09-28 18:17:10 +0000
committerChandler Carruth <chandlerc@gmail.com>2013-09-28 18:17:10 +0000
commit2f101e83b29700b89f1ba3863288de1db0840c90 (patch)
tree8b53005b15853140e7068b7821c2e7f17f0ea826 /projects
parent3f4f420ab7acb10221ba971543a7eed5489fb626 (diff)
downloadexternal_llvm-2f101e83b29700b89f1ba3863288de1db0840c90.zip
external_llvm-2f101e83b29700b89f1ba3863288de1db0840c90.tar.gz
external_llvm-2f101e83b29700b89f1ba3863288de1db0840c90.tar.bz2
Enable libcxx as part of the top level CMake build when it is checked
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
Diffstat (limited to 'projects')
-rw-r--r--projects/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index c19bb67..de06b78 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -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()