[Bf-blender-cvs] Git Commit [92f3fa3] master: OSX/scons: make another gcc conditional futureproof

Jens Verwiebe noreply at git.blender.org
Fri Nov 15 15:52:46 CET 2013


Commit: 92f3fa3fcd97211f7eb9c5d210b0897e481f3a24
Author: Jens Verwiebe
Date:   Fri Nov 15 10:46:10 2013 +0100
http://developer.blender.org/rB92f3fa3fcd97211f7eb9c5d210b0897e481f3a24

OSX/scons: make another gcc conditional futureproof

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index 2c30e1b..8f4acde 100644
--- a/SConstruct
+++ b/SConstruct
@@ -416,7 +416,7 @@ if env['OURPLATFORM']=='darwin':
     if env['WITH_BF_CYCLES_OSL'] == 1:
         OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
         # we need 2 variants of passing the oslexec with the force_load option, string and list type atm
-        if env['CC'][:-2].endswith('4.8'):
+        if env['CC'].split('/')[len(env['CC'].split('/'))-1][4:] >= '4.8':
             env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-loslexec','-loslquery'])
         else:
             env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])




More information about the Bf-blender-cvs mailing list