diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-01-18 05:41:17 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-01-18 05:41:17 +0000 |
| commit | 0320314249863792eef93cc0a222ca8a219d6c8b (patch) | |
| tree | df757710a022ce30b0e5b45342036df12b833c8c /clang/CMakeLists.txt | |
| parent | 673c5f9cea5f0bb34037c7b4e3e4216a58eeb0f9 (diff) | |
[CMake] Separate LLVM_ENABLE_LTO and LLVM_ENABLE_LLD
These two are independent: it's possible to use LLD without LTO,
and it's possible to do LTO build without LLD.
Differential Revision: https://reviews.llvm.org/D28821
llvm-svn: 292343
Diffstat (limited to 'clang/CMakeLists.txt')
| -rw-r--r-- | clang/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index c56707e7fb57..417a90773192 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -515,6 +515,10 @@ if (CLANG_ENABLE_BOOTSTRAP) set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NEXT_CLANG_STAGE}-stamps/) set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NEXT_CLANG_STAGE}-bins/) + if(BOOTSTRAP_LLVM_ENABLE_LLD) + add_dependencies(clang-bootstrap-deps lld) + endif() + # If the next stage is LTO we need to depend on LTO and possibly lld or LLVMgold if(BOOTSTRAP_LLVM_ENABLE_LTO OR LLVM_ENABLE_LTO AND NOT LLVM_BUILD_INSTRUMENTED) if(APPLE) @@ -531,9 +535,7 @@ if (CLANG_ENABLE_BOOTSTRAP) -DDYLD_LIBRARY_PATH=${LLVM_LIBRARY_OUTPUT_INTDIR}) elseif(NOT WIN32) add_dependencies(clang-bootstrap-deps llvm-ar llvm-ranlib) - if(BOOTSTRAP_LLVM_ENABLE_LLD) - add_dependencies(clang-bootstrap-deps lld) - elseif(LLVM_BINUTILS_INCDIR) + if(NOT BOOTSTRAP_LLVM_ENABLE_LLD AND LLVM_BINUTILS_INCDIR) add_dependencies(clang-bootstrap-deps LLVMgold) endif() set(LTO_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar) |