diff options
| -rw-r--r-- | llvm/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | llvm/docs/GettingStarted.rst | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 01252e7d0e1..db35afc2690 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -104,7 +104,7 @@ endif() # LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS # This allows an easy way of setting up a build directory for llvm and another # one for llvm+clang+... using the same sources. -set(LLVM_ALL_PROJECTS "clang;compiler-rt;debuginfo-tests;libclc;libcxx;libcxxabi;libunwind;lld;lldb;llgo;llvm;openmp;parallel-libs;polly;pstl") +set(LLVM_ALL_PROJECTS "clang;clang-tools-extra;compiler-rt;debuginfo-tests;libclc;libcxx;libcxxabi;libunwind;lld;lldb;llgo;llvm;openmp;parallel-libs;polly;pstl") set(LLVM_ENABLE_PROJECTS "" CACHE STRING "Semicolon-separated list of projects to build (${LLVM_ALL_PROJECTS}), or \"all\".") if( LLVM_ENABLE_PROJECTS STREQUAL "all" ) @@ -141,12 +141,6 @@ if (LLVM_ENABLE_PROJECTS_USED OR NOT LLVM_ENABLE_PROJECTS STREQUAL "") message(FATAL_ERROR "LLVM_ENABLE_PROJECTS requests ${proj} but directory not found: ${PROJ_DIR}") endif() set(LLVM_EXTERNAL_${upper_proj}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}") - # There is a widely spread opinion that clang-tools-extra should be merged - # into clang. The following simulates it by always enabling clang-tools-extra - # when enabling clang. - if (proj STREQUAL "clang") - set(LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../clang-tools-extra") - endif() else() message(STATUS "${proj} project is disabled") set(SHOULD_ENABLE_PROJECT FALSE) diff --git a/llvm/docs/GettingStarted.rst b/llvm/docs/GettingStarted.rst index f528bc6014f..f10bcd32151 100644 --- a/llvm/docs/GettingStarted.rst +++ b/llvm/docs/GettingStarted.rst @@ -64,8 +64,8 @@ Here's the short story for getting up and running quickly with LLVM: * ``-DLLVM_ENABLE_PROJECTS='...'`` --- semicolon-separated list of the LLVM subprojects you'd like to additionally build. Can include any of: clang, - libcxx, libcxxabi, libunwind, lldb, compiler-rt, lld, polly, or - debuginfo-tests. + clang-tools-extra, libcxx, libcxxabi, libunwind, lldb, compiler-rt, lld, + polly, or debuginfo-tests. For example, to build LLVM, Clang, libcxx, and libcxxabi, use ``-DLLVM_ENABLE_PROJECTS="clang;libcxx;libcxxabi"``. |
