From 749469803173556e43311399cd446322d1392395 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Fri, 16 Nov 2012 15:18:14 +0000 Subject: [PATCH] OSX/scons/osl: use Xlinker for the BF_PROGRAM_LINKFLAGS, so we can alternative again compile with gcc-4.6 --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'):