[Bf-blender-cvs] [664f8e9] master: OSX/Scons: make sure BF_OSL implies BF_LLVM

[Jens Verwiebe]

Commit: 664f8e90482c100f9b290340cbaaeff0f54c6f7d
Author: Jens Verwiebe
Date:   Thu Aug 14 12:15:59 2014 +0200
Branches: master
https://developer.blender.org/rB664f8e90482c100f9b290340cbaaeff0f54c6f7d

OSX/Scons: make sure BF_OSL implies BF_LLVM

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index c4454ac..12f80b6 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