diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 19:18:14 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 19:18:14 +0400 |
| commit | 749469803173556e43311399cd446322d1392395 (patch) | |
| tree | cc52f72d517c14667c7df464da226cf316f8a8a2 /SConstruct | |
| parent | cf64a5b622151dbcfd7162e7ee93fd7afc88b24f (diff) | |
OSX/scons/osl: use Xlinker for the BF_PROGRAM_LINKFLAGS, so we can alternative again compile with gcc-4.6
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 7a4b74de5aa..42be4ac191b 100644 --- a/SConstruct +++ b/SConstruct @@ -309,7 +309,7 @@ if env['OURPLATFORM']=='darwin': if env['WITH_BF_CYCLES_OSL'] == 1: # this is kinda hardcoded atm due not understood path issues, also look that we need 2 variants of passing the oslexec with the force_load option, why ? env.Append(LINKFLAGS=['-L../lib/darwin-9.x.universal/osl/lib','-loslcomp','-force_load ../lib/darwin-9.x.universal/osl/lib/liboslexec.a','-loslquery']) - env.Append(BF_PROGRAM_LINKFLAGS=['-loslcomp','-force_load','../lib/darwin-9.x.universal/osl/lib/liboslexec.a']) + env.Append(BF_PROGRAM_LINKFLAGS=['-loslcomp','-Xlinker','-force_load','-Xlinker','../lib/darwin-9.x.universal/osl/lib/liboslexec.a']) if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): |