Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <jensverwiebe@jens-macpro.fritz.box>2013-11-15 13:46:10 +0400
committerjensverwiebe <info@jensverwiebe.de>2013-11-15 18:44:29 +0400
commit92f3fa3fcd97211f7eb9c5d210b0897e481f3a24 (patch)
tree76cdd062b488f3886c15cb79287dfe4e4d44adf8 /SConstruct
parenta00f0469ca9f1b64b336e70539676b8d232dbde7 (diff)
OSX/scons: make another gcc conditional futureproof
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 2c30e1b72b1..8f4acde4a04 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'])