archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OSX/scons: fix gnu gcc compile by using clang assembler ( openMP builds)

Browse Source
This commit is contained in:
jens verwiebe
2014-01-27 19:46:05 +01:00
parent 74108e2d6c
commit 623a550eec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
intern/cycles/SConscript
+2 -2
View File
@@ -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)