[Bf-blender-cvs] [623a550] master: OSX/scons: fix gnu gcc compile by using clang assembler ( openMP builds)

[Jens Verwiebe]

Commit: 623a550eec5c7ff3631d88cd3ef3f495cc7cd4d8
Author: Jens Verwiebe
Date:   Mon Jan 27 19:46:05 2014 +0100
https://developer.blender.org/rB623a550eec5c7ff3631d88cd3ef3f495cc7cd4d8

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

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

M	intern/cycles/SConscript

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

diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index efd4a88..c9465ad 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)