christoph/fail
1
Fork 0
Code Releases Activity

doc+cmake: LLVM 3.3 is preferred

Browse Source 
Change-Id: Ie480efbe5ffd2f0a59da7f185bba80a5355251f9
This commit is contained in:
Horst Schirmeier
2013-08-22 17:31:50 +02:00
parent 10420938d2
commit 79ff417e9b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindLLVM.cmake
View File

@ -1,4 +1,4 @@
find_program(LLVMCONFIG NAMES llvm-config llvm-config-3.1) find_program(LLVMCONFIG NAMES llvm-config llvm-config-3.3 llvm-config-3.2 llvm-config-3.1)
if( NOT LLVMCONFIG ) if( NOT LLVMCONFIG )
message(FATAL_ERROR "llvm-config not found, try installing llvm-dev llvm") message(FATAL_ERROR "llvm-config not found, try installing llvm-dev llvm")

5
doc/how-to-build.txt
View File

@ -15,6 +15,11 @@ Required for Fail*:
- AspectC++ (ag++, ac++): AspectC++ 1.1 or newer is known to work and can be - AspectC++ (ag++, ac++): AspectC++ 1.1 or newer is known to work and can be
obtained from http://www.aspectc.org; nightlies can be downloaded from obtained from http://www.aspectc.org; nightlies can be downloaded from
http://akut.aspectc.org http://akut.aspectc.org
- optional:
* LLVM 3.3 (needed for several importers in tools/import-trace)
(compiles/links with 3.1 or 3.2, but fails to properly import information
from ELF binaries not compiled with -ffunction-sections)
Required for the Bochs simulator backend: Required for the Bochs simulator backend:
********************************************************************** **********************************************************************

2
src/core/util/CMakeLists.txt
View File

@ -63,7 +63,7 @@ add_library(fail-util ${SRCS})
add_dependencies(fail-util fail-comm) add_dependencies(fail-util fail-comm)
target_link_libraries(fail-util ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${LIB_IBERTY} ) target_link_libraries(fail-util ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${LIB_IBERTY} )
option(BUILD_LLVM_DISASSEMBLER "Build the llvm based disassembler (exactly llvm 3.1 required)" OFF) option(BUILD_LLVM_DISASSEMBLER "Build the LLVM-based disassembler (LLVM 3.3 preferred, for 3.1 and 3.2 read doc/how-to-build.txt)" OFF)
if (BUILD_LLVM_DISASSEMBLER) if (BUILD_LLVM_DISASSEMBLER)
add_subdirectory(llvmdisassembler) add_subdirectory(llvmdisassembler)
endif (BUILD_LLVM_DISASSEMBLER) endif (BUILD_LLVM_DISASSEMBLER)