[PATCH] D69405: Fix lld detection in standalone compiler-rt.

[Evgenii Stepanov via Phabricator via llvm-commits]

eugenis updated this revision to Diff 226323.
eugenis added a comment.

.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D69405/new/

https://reviews.llvm.org/D69405

Files:
  compiler-rt/CMakeLists.txt
  compiler-rt/cmake/config-ix.cmake
  compiler-rt/test/hwasan/CMakeLists.txt
  compiler-rt/test/msan/CMakeLists.txt
  compiler-rt/test/ubsan/CMakeLists.txt


Index: compiler-rt/test/ubsan/CMakeLists.txt
===================================================================
--- compiler-rt/test/ubsan/CMakeLists.txt
+++ compiler-rt/test/ubsan/CMakeLists.txt
@@ -8,7 +8,9 @@
   set(CONFIG_NAME ${UBSAN_LIT_TEST_MODE})
   if (${lld})
     set(CONFIG_NAME ${CONFIG_NAME}-lld)
-    list(APPEND UBSAN_TEST_DEPS lld)
+    if (TARGET lld)
+      list(APPEND UBSAN_TEST_DEPS lld)
+    endif()
   endif()
   if (${thinlto})
     set(CONFIG_NAME ${CONFIG_NAME}-thinlto)
Index: compiler-rt/test/msan/CMakeLists.txt
===================================================================
--- compiler-rt/test/msan/CMakeLists.txt
+++ compiler-rt/test/msan/CMakeLists.txt
@@ -20,7 +20,9 @@
   endif()
   if (${lld})
     set(CONFIG_NAME "lld-${CONFIG_NAME}")
-    list(APPEND MSAN_TEST_DEPS lld)
+    if (TARGET lld)
+      list(APPEND MSAN_TEST_DEPS lld)
+    endif()
   endif()
   set(MSAN_TEST_USE_THINLTO ${thinlto})
   set(MSAN_TEST_USE_LLD ${lld})
Index: compiler-rt/test/hwasan/CMakeLists.txt
===================================================================
--- compiler-rt/test/hwasan/CMakeLists.txt
+++ compiler-rt/test/hwasan/CMakeLists.txt
@@ -24,7 +24,9 @@
 if(NOT COMPILER_RT_STANDALONE_BUILD)
   list(APPEND HWASAN_TEST_DEPS hwasan)
   if(COMPILER_RT_HAS_LLD)
-    list(APPEND HWASAN_TEST_DEPS lld)
+    if (TARGET lld)
+      list(APPEND HWASAN_TEST_DEPS lld)
+    endif()
   endif()
 endif()
 
Index: compiler-rt/cmake/config-ix.cmake
===================================================================
--- compiler-rt/cmake/config-ix.cmake
+++ compiler-rt/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)
Index: compiler-rt/CMakeLists.txt
===================================================================
--- compiler-rt/CMakeLists.txt
+++ compiler-rt/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)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69405.226323.patch
Type: text/x-patch
Size: 2312 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191024/e0f45d0a/attachment.bin>