From 373de9e9361cdf624cdecf33e7effd4a241f3cc8 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Thu, 7 Mar 2013 22:12:23 +0000 Subject: [PATCH] OSX/gcc-4.6: workaround a compilerbug, use apple-gcc instead --- extern/bullet2/src/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 8a3db17f6d1..3ffff9c80fc 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -35,4 +35,7 @@ bullet2_src += env.Glob("BulletSoftBody/*.cpp") incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody' -env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags ) +if sys.platform=='darwin' and env['CC'][:-2].endswith('4.6'): # workaround for an gcc-4.6 compiler bug + env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' ) +else: + env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )