summaryrefslogtreecommitdiffstats
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
commit408b4fa472e1dfa657e904678aa8a68c757438d1 (patch)
tree9f1f0d40af503afda890e38b72d1612825100cca
parent5352717508c897d87ec25a686519081e1adb357d (diff)
downloadbcm5719-llvm-408b4fa472e1dfa657e904678aa8a68c757438d1.tar.gz
bcm5719-llvm-408b4fa472e1dfa657e904678aa8a68c757438d1.zip
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. llvm-svn: 191624
-rw-r--r--llvm/projects/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/projects/CMakeLists.txt b/llvm/projects/CMakeLists.txt
index c19bb679d18..de06b78423c 100644
--- a/llvm/projects/CMakeLists.txt
+++ b/llvm/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()
OpenPOWER on IntegriCloud