[compiler-rt] 3f34573 - Add missing lld checks in sanitizer tests.

[Evgenii Stepanov via llvm-commits]

Author: Evgenii Stepanov
Date: 2019-10-28T10:32:46-07:00
New Revision: 3f345732b4f88e8d0d302470929cbe33d65a7435

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

LOG: Add missing lld checks in sanitizer tests.

Do not add an lld dependency when this target does not exist. In this
case the system installation of lld is used (or whatever is detected
with -fuse-ld=lld by default).

Added: 
    

Modified: 
    compiler-rt/test/asan/CMakeLists.txt
    compiler-rt/test/cfi/CMakeLists.txt
    compiler-rt/test/fuzzer/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt
index 79e34a01619a..e67a0e869974 100644
--- a/compiler-rt/test/asan/CMakeLists.txt
+++ b/compiler-rt/test/asan/CMakeLists.txt
@@ -30,7 +30,7 @@ endmacro()
 set(ASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 if(NOT COMPILER_RT_STANDALONE_BUILD)
   list(APPEND ASAN_TEST_DEPS asan)
-  if(NOT APPLE AND COMPILER_RT_HAS_LLD)
+  if(NOT APPLE AND COMPILER_RT_HAS_LLD AND TARGET lld)
     list(APPEND ASAN_TEST_DEPS lld)
   endif()
 endif()

diff  --git a/compiler-rt/test/cfi/CMakeLists.txt b/compiler-rt/test/cfi/CMakeLists.txt
index 9b6ef0f67cba..a787ecdb38a7 100644
--- a/compiler-rt/test/cfi/CMakeLists.txt
+++ b/compiler-rt/test/cfi/CMakeLists.txt
@@ -86,7 +86,7 @@ if(NOT COMPILER_RT_STANDALONE_BUILD)
       )
     endif()
   endif()
-  if(NOT APPLE AND COMPILER_RT_HAS_LLD)
+  if(NOT APPLE AND COMPILER_RT_HAS_LLD AND TARGET lld)
     list(APPEND CFI_TEST_DEPS
       lld
     )

diff  --git a/compiler-rt/test/fuzzer/CMakeLists.txt b/compiler-rt/test/fuzzer/CMakeLists.txt
index 25bdcd2f0d97..5618096173ad 100644
--- a/compiler-rt/test/fuzzer/CMakeLists.txt
+++ b/compiler-rt/test/fuzzer/CMakeLists.txt
@@ -7,7 +7,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD)
   if (COMPILER_RT_HAS_DFSAN)
     list(APPEND LIBFUZZER_TEST_DEPS dfsan)
   endif()
-  if(NOT APPLE AND COMPILER_RT_HAS_LLD)
+  if(NOT APPLE AND COMPILER_RT_HAS_LLD AND TARGET lld)
     list(APPEND LIBFUZZER_TEST_DEPS lld)
   endif()
 endif()