[llvm] 352558e - [llvm] Avoid linking llvm-cfi-verify to duplicate libs

[Michał Górny via llvm-commits]

Author: Michał Górny
Date: 2020-06-17T19:00:26+02:00
New Revision: 352558e69b3691cfdc8e1adc2a1fbb737bc67cbb

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

LOG: [llvm] Avoid linking llvm-cfi-verify to duplicate libs

Fix the CMake rules for LLVMCFIVerify library not to pull duplicate
LLVM .a libraries when linking to the dylib.  This prevents problems
due to duplicate symbols and apparently fixes mingw32.

This is an alternative approach to D44650 that just forces .a libraries
instead.  However, there doesn't seem to be any reason to do that.

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

Added: 
    

Modified: 
    llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
index 82ca42e624a4..41d55ed93216 100644
--- a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
+++ b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
@@ -7,13 +7,17 @@ add_library(LLVMCFIVerify
   )
 
 llvm_update_compile_flags(LLVMCFIVerify)
-llvm_map_components_to_libnames(libs
-  DebugInfoDWARF
-  MC
-  MCParser
-  Object
-  Support
-  Symbolize
-  )
+if (LLVM_LINK_LLVM_DYLIB)
+  set(libs LLVM)
+else()
+  llvm_map_components_to_libnames(libs
+    DebugInfoDWARF
+    MC
+    MCParser
+    Object
+    Support
+    Symbolize
+    )
+endif()
 target_link_libraries(LLVMCFIVerify ${libs})
 set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")