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 /build_files/scons | |
| 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 'build_files/scons')
| -rw-r--r-- | build_files/scons/config/linux-config.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 0ffd9ca9cc6..038a9bc421d 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -298,3 +298,7 @@ BF_INSTALLDIR='../install/linux' #Link against pthread PLATFORM_LINKFLAGS = ['-pthread'] +#Fix for LLVM conflict with Mesa llvmpipe +if WITH_BF_LLVM: + PLATFORM_LINKFLAGS += ['-Wl,--version-script=source/creator/blender.map'] + |