From 09fae1f25773749ef18eb00053f1634c0fd3cb56 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sun, 31 Jul 2011 22:00:40 +0000 Subject: [PATCH] I mis-interpreted the MCDisassembler's intended dependencies. Now to fix them properly. Specifically, the disassembler clearly attempts to initialiaze all TargetInfo, MCTargeDesc, AsmParser, and Disassembler sublibraries of registered targets. This makes the CMakeLists accurately reflect this intent in the code. This should fix the last of the link errors that I have gotten reports of on OS X, but if anyone continues to see link errors, continue to pester me and I'll look into it. llvm-svn: 136603 --- llvm/lib/MC/MCDisassembler/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/llvm/lib/MC/MCDisassembler/CMakeLists.txt b/llvm/lib/MC/MCDisassembler/CMakeLists.txt index 45ec75d00e4d..4debb288e5ab 100644 --- a/llvm/lib/MC/MCDisassembler/CMakeLists.txt +++ b/llvm/lib/MC/MCDisassembler/CMakeLists.txt @@ -15,9 +15,16 @@ add_llvm_library_dependencies(LLVMMCDisassembler foreach(t ${LLVM_TARGETS_TO_BUILD}) set(td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}) + if(EXISTS ${td}/TargetInfo/CMakeLists.txt) + add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Info") + endif() + if(EXISTS ${td}/MCTargetDesc/CMakeLists.txt) + add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Desc") + endif() + if(EXISTS ${td}/AsmParser/CMakeLists.txt) + add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}AsmParser") + endif() if(EXISTS ${td}/Disassembler/CMakeLists.txt) add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Disassembler") - elseif(EXISTS ${td}/TargetInfo/CMakeLists.txt) - add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Info") endif() endforeach(t) -- GitLab