diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-29 12:59:57 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-29 12:59:57 +0400 |
| commit | a9c8a117a267e1feec7471309107c8ef67dc5dc3 (patch) | |
| tree | beaab1d9d8643be1ed13b70aefe7cc0153c1a961 /SConstruct | |
| parent | 564c48a06868e56c2ca06a6cc7ba193baadea218 (diff) | |
OSX/scons: Fix linking if llvm is not used ( new osl/llvm/oiio related )
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 331158e89d2..91ade7ec0cd 100644 --- a/SConstruct +++ b/SConstruct @@ -438,6 +438,10 @@ if env['OURPLATFORM']=='darwin': 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']) + if env['WITH_BF_LLVM'] == 0: + # Due duplicated generic UTF functions, we pull them either from LLVMSupport or COLLADA + env.Append(BF_OPENCOLLADA_LIB=' UTF') + # Trying to get rid of eventually clashes, we export some symbols explicite as local env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map']) |