phosek created this revision.
phosek added a reviewer: beanz.
phosek added subscribers: cfe-commits, ruiu.
phosek set the repository for this revision to rL LLVM.
Herald added subscribers: mehdi_amini, mgorny.
lld has LTO support, if requested we should add a dependency on lld rather than
LLVMgold when doing LTO bootstrap build.
Repository:
rL LLVM
https://reviews.llvm.org/D26649
Files:
CMakeLists.txt
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -511,7 +511,7 @@
set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NEXT_CLANG_STAGE}-stamps/)
set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NEXT_CLANG_STAGE}-bins/)
- # If the next stage is LTO we need to depend on LTO and possibly LLVMgold
+ # 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)
add_dependencies(clang-bootstrap-deps LTO)
if(APPLE)
@@ -526,7 +526,12 @@
set(LTO_LIBRARY
-DDARWIN_LTO_LIBRARY=${LLVM_SHLIB_OUTPUT_INTDIR}/libLTO.dylib
-DDYLD_LIBRARY_PATH=${LLVM_LIBRARY_OUTPUT_INTDIR})
elseif(NOT WIN32)
- add_dependencies(clang-bootstrap-deps LLVMgold llvm-ar llvm-ranlib)
+ add_dependencies(clang-bootstrap-deps llvm-ar llvm-ranlib)
+ if(LLVM_ENABLE_LLD)
+ add_dependencies(lld)
+ elseif(LLVM_BINUTILS_INCDIR)
+ add_dependencies(LLVMgold)
+ endif()
set(LTO_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar)
set(LTO_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib)
endif()
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -511,7 +511,7 @@
set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NEXT_CLANG_STAGE}-stamps/)
set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NEXT_CLANG_STAGE}-bins/)
- # If the next stage is LTO we need to depend on LTO and possibly LLVMgold
+ # 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)
add_dependencies(clang-bootstrap-deps LTO)
if(APPLE)
@@ -526,7 +526,12 @@
set(LTO_LIBRARY -DDARWIN_LTO_LIBRARY=${LLVM_SHLIB_OUTPUT_INTDIR}/libLTO.dylib
-DDYLD_LIBRARY_PATH=${LLVM_LIBRARY_OUTPUT_INTDIR})
elseif(NOT WIN32)
- add_dependencies(clang-bootstrap-deps LLVMgold llvm-ar llvm-ranlib)
+ add_dependencies(clang-bootstrap-deps llvm-ar llvm-ranlib)
+ if(LLVM_ENABLE_LLD)
+ add_dependencies(lld)
+ elseif(LLVM_BINUTILS_INCDIR)
+ add_dependencies(LLVMgold)
+ endif()
set(LTO_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar)
set(LTO_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib)
endif()
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
