[llvm] r296850 - Revert r296730, "cmake: Configure the ThinLTO cache directory when using ELF lld or gold."

[Mehdi Amini via llvm-commits]

Do you know why it failed? That seems scary if enabling the cache triggers this.

— 
Mehdi

> On Mar 2, 2017, at 6:00 PM, Peter Collingbourne via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: pcc
> Date: Thu Mar  2 20:00:22 2017
> New Revision: 296850
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=296850&view=rev
> Log:
> Revert r296730, "cmake: Configure the ThinLTO cache directory when using ELF lld or gold."
> 
> Causes a build failure on the clang-with-thin-lto-ubuntu bot.
> http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/2117/steps/build-stage3-compiler/logs/stdio
> 
> Modified:
>    llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
> 
> Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=296850&r1=296849&r2=296850&view=diff
> ==============================================================================
> --- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)
> +++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Thu Mar  2 20:00:22 2017
> @@ -715,20 +715,11 @@ if(uppercase_LLVM_ENABLE_LTO STREQUAL "T
>   if(NOT LINKER_IS_LLD_LINK)
>     append("-flto=thin" CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
>   endif()
> -  # If the linker supports it, enable the lto cache. This improves initial build
> -  # time a little since we re-link a lot of the same objects, and significantly
> -  # improves incremental build time.
> -  # FIXME: We should move all this logic into the clang driver.
> -  if(APPLE)
> -    append("-Wl,-cache_path_lto,${PROJECT_BINARY_DIR}/lto.cache"
> -           CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
> -  elseif(UNIX AND LLVM_USE_LINKER STREQUAL "lld")
> -    append("-Wl,--thinlto-cache-dir=${PROJECT_BINARY_DIR}/lto.cache"
> -           CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
> -  elseif(LLVM_USE_LINKER STREQUAL "gold")
> -    append("-Wl,--plugin-opt,cache-dir=${PROJECT_BINARY_DIR}/lto.cache"
> -           CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
> -  endif()
> +  # On darwin, enable the lto cache. This improves initial build time a little
> +  # since we re-link a lot of the same objects, and significantly improves
> +  # incremental build time.
> +  append_if(APPLE "-Wl,-cache_path_lto,${PROJECT_BINARY_DIR}/lto.cache"
> +            CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
> elseif(uppercase_LLVM_ENABLE_LTO STREQUAL "FULL")
>   append("-flto=full" CMAKE_CXX_FLAGS CMAKE_C_FLAGS)
>   if(NOT LINKER_IS_LLD_LINK)
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits