christoph/fail
1
Fork 0
Code Releases Activity

Merge branch 'llvm-rtti'

Browse Source
This commit is contained in:
Horst Schirmeier
2014-10-01 15:02:00 +02:00
parent ebbf35c509 3869cebde3
commit 66408e83ce
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,13 @@ Required for Fail*:
<http://akut.aspectc.org>. Make sure you use the 64-bit version if running <http://akut.aspectc.org>. Make sure you use the 64-bit version if running
in a 64-bit environment. in a 64-bit environment.
- optional: - optional:
* LLVM 3.3 (needed for several importers in tools/import-trace) * LLVM 3.3 or 3.4 (needed for several importers in tools/import-trace)
(compiles/links with 3.1 or 3.2, but fails to properly import information (compiles/links with 3.1 or 3.2, but fails to properly import information
from ELF binaries not compiled with -ffunction-sections) from ELF binaries not compiled with -ffunction-sections)
- configured with, e.g., --enable-optimized --disable-assertions
--disable-werror
- built with "make REQUIRES_RTTI=1" (the Debian/Ubuntu packages already
come built this way)
* a MySQL 5.0+ or MariaDB 5.1+ (MariaDB 5.5 recommended) server * a MySQL 5.0+ or MariaDB 5.1+ (MariaDB 5.5 recommended) server

3
src/core/util/llvmdisassembler/CMakeLists.txt
View File

@ -11,8 +11,7 @@ set(SRCS
include(FindLLVM) include(FindLLVM)
# compiling without -fno-rtti fails even when LLVM is not built with that flag set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS} -fno-rtti" )
add_library(fail-llvmdisassembler ${SRCS}) add_library(fail-llvmdisassembler ${SRCS})
target_link_libraries(fail-llvmdisassembler fail-sal) target_link_libraries(fail-llvmdisassembler fail-sal)