From 92f3fa3fcd97211f7eb9c5d210b0897e481f3a24 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Fri, 15 Nov 2013 10:46:10 +0100 Subject: [PATCH] OSX/scons: make another gcc conditional futureproof --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'])