Author: Evgenii Stepanov Date: 2019-10-22T13:29:57-07:00 New Revision: b26b8ee2bcf5180b51b5f27c6c3424c5e079362e
URL: https://github.com/llvm/llvm-project/commit/b26b8ee2bcf5180b51b5f27c6c3424c5e079362e DIFF: https://github.com/llvm/llvm-project/commit/b26b8ee2bcf5180b51b5f27c6c3424c5e079362e.diff LOG: Revert "Fix lld detection in standalone compiler-rt." Breaks sanitizer-android buildbot. This reverts commit d56203201f8a1f11abb913c4dfc0bf9c61432d1a. Added: Modified: compiler-rt/CMakeLists.txt compiler-rt/cmake/config-ix.cmake Removed: ################################################################################ diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index f8925ab2d76c..50d0eb0ed903 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -497,7 +497,7 @@ else() if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD) set(COMPILER_RT_HAS_LLD TRUE) else() - set(COMPILER_RT_HAS_LLD ${COMPILER_RT_HAS_FUSE_LD_LLD_FLAG}) + set(COMPILER_RT_HAS_LLD FALSE) endif() endif() pythonize_bool(COMPILER_RT_HAS_LLD) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index bc81a7b9d967..875acc83be4e 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -146,7 +146,6 @@ check_library_exists(stdc++ __cxa_throw "" COMPILER_RT_HAS_LIBSTDCXX) # Linker flags. check_linker_flag("-Wl,-z,text" COMPILER_RT_HAS_Z_TEXT) -check_linker_flag("-fuse-ld=lld" COMPILER_RT_HAS_FUSE_LD_LLD_FLAG) if(ANDROID) check_linker_flag("-Wl,-z,global" COMPILER_RT_HAS_Z_GLOBAL) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
