summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-07-31 22:00:40 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-07-31 22:00:40 +0000
commit87334094482e99940030960d22ddc49c97abf025 (patch)
treee37935b6def223f5c9994ba41de1c21590ddba63
parentaf75f0ca8636e3f6ac9a43aeadacc4eeac2ce75b (diff)
downloadexternal_llvm-87334094482e99940030960d22ddc49c97abf025.zip
external_llvm-87334094482e99940030960d22ddc49c97abf025.tar.gz
external_llvm-87334094482e99940030960d22ddc49c97abf025.tar.bz2
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136603 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/MC/MCDisassembler/CMakeLists.txt11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/MC/MCDisassembler/CMakeLists.txt b/lib/MC/MCDisassembler/CMakeLists.txt
index 45ec75d..4debb28 100644
--- a/lib/MC/MCDisassembler/CMakeLists.txt
+++ b/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)