diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-27 22:46:05 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-27 22:46:05 +0400 |
| commit | 623a550eec5c7ff3631d88cd3ef3f495cc7cd4d8 (patch) | |
| tree | 0a85128fe87a3e75dacb7f4d60f477dc54979e65 /intern/cycles/SConscript | |
| parent | 74108e2d6c3ee93e49f89892f3a5d72c039a6168 (diff) | |
OSX/scons: fix gnu gcc compile by using clang assembler ( openMP builds)
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index efd4a88c80c..c9465ada950 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -102,8 +102,8 @@ optim_defs = defs[:] cycles_avx = cycles.Clone() avx_sources = [path.join('kernel', 'kernel_avx.cpp')] -if env['OURPLATFORM'] == 'darwin': # always use Apple assembler for avx , gnu-compilers do not support it ( vanilla gcc-4.6 or higher case ) - cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) +if env['OURPLATFORM'] == 'darwin' and env['C_COMPILER_ID'] == 'gcc' and env['CCVERSION'] >= '4.6': # use Apple assembler for avx , gnu-compilers do not support it ( gnu gcc-4.6 or higher case ) + cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags, cc_compilerchange='/usr/bin/clang', cxx_compilerchange='/usr/bin/clang++') else: cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) |