|
|
bad0ab4 |
From 352558e69b3691cfdc8e1adc2a1fbb737bc67cbb Mon Sep 17 00:00:00 2001
|
|
|
bad0ab4 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
|
bad0ab4 |
Date: Tue, 16 Jun 2020 12:16:52 +0200
|
|
|
bad0ab4 |
Subject: [PATCH] [llvm] Avoid linking llvm-cfi-verify to duplicate libs
|
|
|
bad0ab4 |
|
|
|
bad0ab4 |
Fix the CMake rules for LLVMCFIVerify library not to pull duplicate
|
|
|
bad0ab4 |
LLVM .a libraries when linking to the dylib. This prevents problems
|
|
|
bad0ab4 |
due to duplicate symbols and apparently fixes mingw32.
|
|
|
bad0ab4 |
|
|
|
bad0ab4 |
This is an alternative approach to D44650 that just forces .a libraries
|
|
|
bad0ab4 |
instead. However, there doesn't seem to be any reason to do that.
|
|
|
bad0ab4 |
|
|
|
bad0ab4 |
Differential Revision: https://reviews.llvm.org/D81921
|
|
|
bad0ab4 |
---
|
|
|
bad0ab4 |
llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt | 20 +++++++++++--------
|
|
|
bad0ab4 |
1 file changed, 12 insertions(+), 8 deletions(-)
|
|
|
bad0ab4 |
|
|
|
bad0ab4 |
diff --git a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
|
|
|
bad0ab4 |
index 82ca42e624a..41d55ed9321 100644
|
|
|
bad0ab4 |
--- a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
|
|
|
bad0ab4 |
+++ b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
|
|
|
bad0ab4 |
@@ -7,13 +7,17 @@ add_library(LLVMCFIVerify
|
|
|
bad0ab4 |
)
|
|
|
bad0ab4 |
|
|
|
bad0ab4 |
llvm_update_compile_flags(LLVMCFIVerify)
|
|
|
bad0ab4 |
-llvm_map_components_to_libnames(libs
|
|
|
bad0ab4 |
- DebugInfoDWARF
|
|
|
bad0ab4 |
- MC
|
|
|
bad0ab4 |
- MCParser
|
|
|
bad0ab4 |
- Object
|
|
|
bad0ab4 |
- Support
|
|
|
bad0ab4 |
- Symbolize
|
|
|
bad0ab4 |
- )
|
|
|
bad0ab4 |
+if (LLVM_LINK_LLVM_DYLIB)
|
|
|
bad0ab4 |
+ set(libs LLVM)
|
|
|
bad0ab4 |
+else()
|
|
|
bad0ab4 |
+ llvm_map_components_to_libnames(libs
|
|
|
bad0ab4 |
+ DebugInfoDWARF
|
|
|
bad0ab4 |
+ MC
|
|
|
bad0ab4 |
+ MCParser
|
|
|
bad0ab4 |
+ Object
|
|
|
bad0ab4 |
+ Support
|
|
|
bad0ab4 |
+ Symbolize
|
|
|
bad0ab4 |
+ )
|
|
|
bad0ab4 |
+endif()
|
|
|
bad0ab4 |
target_link_libraries(LLVMCFIVerify ${libs})
|
|
|
bad0ab4 |
set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
|
|
|
bad0ab4 |
--
|
|
|
bad0ab4 |
2.18.1
|
|
|
bad0ab4 |
|