commit 59231e5aff254f28b7ea7bcfd32cd759511d5844
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Mon Oct 21 23:59:45 2019 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Mon Oct 21 23:59:45 2019 +0000
tree d4fff985201a01bc6dd7f94b813c42cafa18fe86
parent a3697b7f0eb500a70f161e7f8633d3936ab4ad81

Fix lld detection in standalone compiler-rt.

Summary:
Right now all hwasan tests on Android are silently disabled because they
require "has_lld" and standalone compiler-rt can not (and AFAIK was
never able to) set it.

Reviewers: pcc, dyung

Subscribers: dberris, mgorny, #sanitizers, llvm-commits

Tags: #sanitizers, #llvm

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

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@375472 91177308-0d34-0410-b5e6-96231b3b80d8

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50d0eb0..f8925ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -497,7 +497,7 @@
   if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
     set(COMPILER_RT_HAS_LLD TRUE)
   else()
-    set(COMPILER_RT_HAS_LLD FALSE)
+    set(COMPILER_RT_HAS_LLD ${COMPILER_RT_HAS_FUSE_LD_LLD_FLAG})
   endif()
 endif()
 pythonize_bool(COMPILER_RT_HAS_LLD)

cmake/config-ix.cmake

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 875acc8..bc81a7b 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -146,6 +146,7 @@
 
 # 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)