[compiler-rt] cf1d044 - [CMake][compiler-rt] Only set lld as available when it was built

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Mon Jun 29 15:09:17 PDT 2020


Author: Petr Hosek
Date: 2020-06-29T15:09:05-07:00
New Revision: cf1d04484344be52ada8178e41d18fd15a9b880c

URL: https://github.com/llvm/llvm-project/commit/cf1d04484344be52ada8178e41d18fd15a9b880c
DIFF: https://github.com/llvm/llvm-project/commit/cf1d04484344be52ada8178e41d18fd15a9b880c.diff

LOG: [CMake][compiler-rt] Only set lld as available when it was built

The `-fuse-ld=lld` check might succeed because there's a system lld,
but that lld may be out-of-date which would cause any tests that
attempt to use for LTO fail. This was observed on some of the bots.

Differential Revision: https://reviews.llvm.org/D81629

Added: 
    

Modified: 
    compiler-rt/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 8619b6e6280c..fa62814b635d 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -535,8 +535,6 @@ else()
   set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/../lld)
   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})
   endif()
 endif()
 pythonize_bool(COMPILER_RT_HAS_LLD)


        


More information about the llvm-commits mailing list