From e572a433a8fefa4e45318c545b48eb8c82bb97ef Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Thu, 7 Nov 2013 15:05:59 +0000 Subject: OSX/scons: make gcc version detection more futureproof --- build_files/scons/tools/Blender.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_files/scons/tools') diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index b79ba991b9a..06cc6b7f00a 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -700,7 +700,8 @@ def AppIt(target=None, source=None, env=None): commands.getoutput(cmd) cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary) commands.getoutput(cmd) - if env['CC'][:-2].endswith('4.6') or env['CC'][:-2].endswith('4.8'): # for correct errorhandling with gcc 4.6/4.8.x we need the gcc.dylib and gomp.dylib to link, thus distribute in app-bundle + if env['CC'].split('/')[len(env['CC'].split('/'))-1][4:] >= '4.6.1': # for correct errorhandling with gcc <= 4.6.1 we need the gcc.dylib and gomp.dylib to link, thus distribute in app-bundle + print "Bundling libgcc and libgomp" cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary) commands.getoutput(cmd) instname = env['BF_CXX'] -- cgit v1.2.3