diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-04-27 18:52:48 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-04-27 18:52:48 +0000 |
| commit | 31046054a8eb0cc74a0fcbefaea77da2c061befa (patch) | |
| tree | 251a27e2e9b6b945466f60d3c2410eb8841a7c0e /clang/CMakeLists.txt | |
| parent | 5593ce5633e8abfe54fdabd455c385f979d6faaa (diff) | |
[CMake] On Darwin bootstrap LTO builds set DYLD_LIBRARY_PATH instead of using llvm-ar
llvm-ar isn't really supported for Darwin, instead the host tools will load libLTO, so we can use the just-built libLTO.
This actually makes Darwin bootstrap builds a little faster because you don't need to build llvm-ar before starting the next stage.
llvm-svn: 267756
Diffstat (limited to 'clang/CMakeLists.txt')
| -rw-r--r-- | clang/CMakeLists.txt | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 5c0d28de36d4..66f902209c1c 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -685,17 +685,21 @@ 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/) + set(cmake_command ${CMAKE_COMMAND}) - # If on Darwin we need to make bootstrap depend on LTO and pass - # DARWIN_LTO_LIBRARY so that -flto will work using the just-built compiler + # If the next stage is LTO we need to depend on LTO and possibly LLVMgold if(BOOTSTRAP_LLVM_ENABLE_LTO OR LLVM_ENABLE_LTO) - set(LTO_DEP LTO llvm-ar llvm-ranlib) - set(LTO_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar) - set(LTO_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib) + set(LTO_DEP LTO) if(APPLE) + # on Darwin we need to set DARWIN_LTO_LIBRARY so that -flto will work + # using the just-built compiler, and we need to override DYLD_LIBRARY_PATH + # so that the host object file tools will use the just-built libLTO. set(LTO_LIBRARY -DDARWIN_LTO_LIBRARY=${LLVM_SHLIB_OUTPUT_INTDIR}/libLTO.dylib) + set(cmake_command ${CMAKE_COMMAND} -E env DYLD_LIBRARY_PATH=${LLVM_LIBRARY_OUTPUT_INTDIR} ${CMAKE_COMMAND}) elseif(NOT WIN32) - list(APPEND LTO_DEP LLVMgold) + list(APPEND LTO_DEP LLVMgold llvm-ar llvm-ranlib) + set(LTO_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar) + set(LTO_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib) endif() endif() @@ -791,6 +795,7 @@ if (CLANG_ENABLE_BOOTSTRAP) -DCLANG_STAGE=${NEXT_CLANG_STAGE} ${COMPILER_OPTIONS} ${LTO_LIBRARY} ${LTO_AR} ${LTO_RANLIB} ${verbose} ${PGO_OPT} + CMAKE_COMMAND ${cmake_command} INSTALL_COMMAND "" STEP_TARGETS configure build ${cmake_3_4_USES_TERMINAL_OPTIONS} @@ -799,7 +804,7 @@ if (CLANG_ENABLE_BOOTSTRAP) # exclude really-install from main target set_target_properties(${NEXT_CLANG_STAGE} PROPERTIES _EP_really-install_EXCLUDE_FROM_MAIN On) ExternalProject_Add_Step(${NEXT_CLANG_STAGE} really-install - COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install + COMMAND ${cmake_command} --build <BINARY_DIR> --target install COMMENT "Performing install step for '${NEXT_CLANG_STAGE}'" DEPENDEES build ${cmake_3_4_USES_TERMINAL} @@ -815,7 +820,7 @@ if (CLANG_ENABLE_BOOTSTRAP) set_target_properties(${NEXT_CLANG_STAGE} PROPERTIES _EP_${target}_EXCLUDE_FROM_MAIN On) ExternalProject_Add_Step(${NEXT_CLANG_STAGE} ${target} - COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target ${target} + COMMAND ${cmake_command} --build <BINARY_DIR> --target ${target} COMMENT "Performing ${target} for '${NEXT_CLANG_STAGE}'" DEPENDEES configure ${cmake_3_4_USES_TERMINAL} |