diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-08-14 14:15:59 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-08-14 14:16:11 +0400 |
| commit | 664f8e90482c100f9b290340cbaaeff0f54c6f7d (patch) | |
| tree | 4defc0cb2032d06d7bba27013d37fb96c5883704 /SConstruct | |
| parent | f7dcec1f693f4f017385815c80cecfae18ac9692 (diff) | |
OSX/Scons: make sure BF_OSL implies BF_LLVM
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index c4454ac17bb..12f80b66552 100644 --- a/SConstruct +++ b/SConstruct @@ -433,6 +433,7 @@ if env['OURPLATFORM']=='darwin': print B.bc.OKGREEN + "Disabled OpenMP, not supported by compiler" if env['WITH_BF_CYCLES_OSL'] == 1: + env['WITH_BF_LLVM'] = 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['C_COMPILER_ID'] == 'gcc' and env['CCVERSION'] >= '4.8' or env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.4': @@ -440,6 +441,8 @@ if env['OURPLATFORM']=='darwin': 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']) + else: + env['WITH_BF_LLVM'] = 0 if env['WITH_BF_LLVM'] == 0: # Due duplicated generic UTF functions, we pull them either from LLVMSupport or COLLADA |