diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-28 22:42:14 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-28 22:42:14 +0400 |
| commit | f418097bc600fab537538ede72923d833ce60573 (patch) | |
| tree | 43dba42a224cf861e3788fe27c12e8f2e36f1fe6 /SConstruct | |
| parent | 1a30e52142c52010f889113cf4d3669f3461f668 (diff) | |
OSX/Scons/OMP: 1. Allow for compile with gnu gcc 4.8.1, 2. fix compiling with sdk > 10.7 by using libgomp dynamic, which includes proper errorhandling vs. static. Before xtra linking to system libstdc++.6.dylib was needed, which then caused incompatibilities
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 862063499a9..f95a2903db1 100644 --- a/SConstruct +++ b/SConstruct @@ -322,7 +322,10 @@ 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 - env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery']) + if env['CC'][:-2].endswith('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']) env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a']) # Trying to get rid of eventually clashes, we export some explicite as local symbols |