diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 4607df20ad1..f5165606700 100644 --- a/SConstruct +++ b/SConstruct @@ -409,10 +409,12 @@ if env['OURPLATFORM']=='darwin': #Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer ) # if your compiler does not have accurate suffix you may have to enable it by hand ! if env['WITH_BF_OPENMP'] == 1: - if env['CC'][:-2].endswith('4.6') or env['CC'][:-2].endswith('4.8'): + if env['CC'].split('/')[len(env['CC'].split('/'))-1][4:] >= '4.6.1': env['WITH_BF_OPENMP'] = 1 # multithreading for fluids, cloth, sculpt and smoke + print B.bc.OKGREEN + "Using OpenMP" else: env['WITH_BF_OPENMP'] = 0 + print B.bc.OKGREEN + "Disabled OpenMP" if env['WITH_BF_CYCLES_OSL'] == 1: OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath 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'] |