diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-22 02:28:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-22 02:28:15 +0400 |
| commit | 629ea82a13cc073c9941f1512d5fad97883542a7 (patch) | |
| tree | 77c2806fb2549ed6e04acd3185a5400dbf338952 /CMakeLists.txt | |
| parent | 031230265c979991e10abfc8ad1d70d49445fcab (diff) | |
Fix 33149: LLVM caused startup crash on linux systems using Mesa llvmpipe.
Now we hide the LLVM symbols with an ld version script to avoid conflicts.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ca01a8a28b..751c2dd548e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -759,6 +759,9 @@ if(UNIX AND NOT APPLE) else() message(FATAL_ERROR "LLVM not found.") endif() + + # Fix for conflict with Mesa llvmpipe + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/source/creator/blender.map") endif() if(WITH_CYCLES_OSL) @@ -821,7 +824,7 @@ if(UNIX AND NOT APPLE) endif() endif() - set(PLATFORM_LINKFLAGS "-pthread") + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread") # lfs on glibc, all compilers should use add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE) |