summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Bieneman <beanz@apple.com>2015-06-22 21:58:02 +0000
committerChris Bieneman <beanz@apple.com>2015-06-22 21:58:02 +0000
commit69533a5a85cca7c89a68f794eb0355f605131adc (patch)
tree79740eaf4cbe671c4acfb100836768803734115d
parente6fd8c423250384dbb980ff83effc7f7397c7042 (diff)
downloadbcm5719-llvm-69533a5a85cca7c89a68f794eb0355f605131adc.tar.gz
bcm5719-llvm-69533a5a85cca7c89a68f794eb0355f605131adc.zip
[CMake] Treating LLVM_INCLUDE_TOOLS, which is a bool, as a string to change behaviors of the build is a dirty hack. We shouldn't do it.
Summary: I don't think anyone is relying on this behavior for bootstrapping (because I don't think it works), but if you do need it, speak now or forever hold your peace. Reviewers: chapuni, samsonov Reviewed By: samsonov Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D10613 llvm-svn: 240344
-rw-r--r--llvm/tools/CMakeLists.txt13
1 files changed, 5 insertions, 8 deletions
diff --git a/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt
index 7859b49c9de..c9c5a1fdfa0 100644
--- a/llvm/tools/CMakeLists.txt
+++ b/llvm/tools/CMakeLists.txt
@@ -75,14 +75,11 @@ add_llvm_tool_subdirectory(gold)
add_llvm_external_project(clang)
add_llvm_external_project(llgo)
+add_llvm_external_project(lld)
+add_llvm_external_project(lldb)
-if( NOT LLVM_INCLUDE_TOOLS STREQUAL "bootstrap-only" )
- add_llvm_external_project(lld)
- add_llvm_external_project(lldb)
-
- # Automatically add remaining sub-directories containing a 'CMakeLists.txt'
- # file as external projects.
- add_llvm_implicit_external_projects()
-endif()
+# Automatically add remaining sub-directories containing a 'CMakeLists.txt'
+# file as external projects.
+add_llvm_implicit_external_projects()
set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)
OpenPOWER on IntegriCloud