This is an archive of the discontinued LLVM Phabricator instance.

Differential D81921

[llvm] Avoid linking llvm-cfi-verify to duplicate libs
ClosedPublic

Authored by mgorny on Jun 16 2020, 3:24 AM.

Details

Reviewers
vlad.tsyrklevich
hctim
mstorsjo
Commits
rG352558e69b36: [llvm] Avoid linking llvm-cfi-verify to duplicate libs
Summary

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.

Diff Detail

Event Timeline

mgorny created this revision.Jun 16 2020, 3:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 16 2020, 3:24 AM
Harbormaster completed remote builds in B60447: Diff 271016.Jun 16 2020, 4:58 AM
hctim accepted this revision.Jun 16 2020, 10:13 AM

LGTM, thanks!

This revision is now accepted and ready to land.Jun 16 2020, 10:13 AM
Closed by commit rG352558e69b36: [llvm] Avoid linking llvm-cfi-verify to duplicate libs (authored by mgorny). · Explain WhyJun 17 2020, 10:13 AM
This revision was automatically updated to reflect the committed changes.
loladiro mentioned this in D90969: Renovate CMake file for the `llvm-cfi-verify` tool.Jan 5 2021, 3:04 PM

Revision Contents

PathSize
llvm/
tools/
llvm-cfi-verify/
lib/
20 lines

Diff 271404

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

add_library(LLVMCFIVerify add_library(LLVMCFIVerify
STATIC STATIC
FileAnalysis.cpp FileAnalysis.cpp
FileAnalysis.h FileAnalysis.h
GraphBuilder.cpp GraphBuilder.cpp
GraphBuilder.h GraphBuilder.h
) )
llvm_update_compile_flags(LLVMCFIVerify) llvm_update_compile_flags(LLVMCFIVerify)
if (LLVM_LINK_LLVM_DYLIB)
set(libs LLVM)
else()
llvm_map_components_to_libnames(libs llvm_map_components_to_libnames(libs
DebugInfoDWARF DebugInfoDWARF
MC MC
MCParser MCParser
Object Object
Support Support
Symbolize Symbolize
) )
endif()
target_link_libraries(LLVMCFIVerify ${libs}) target_link_libraries(LLVMCFIVerify ${libs})
set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries") set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")