[Bf-blender-cvs] [8842569] master: OSX/Cycles: tentative fix for avx, try use the compiler that is default on desired xcode version. Atm. it is only verified to work with clang 5.0, so either this works too with llvm-gcc or apple gcc, or we have to rise the requirements for osx.

[Jens Verwiebe]

Commit: 8842569bc4bbb8ed0fa3e4dc401f354e064adf90
Author: Jens Verwiebe
Date:   Fri Jan 17 14:56:16 2014 +0100
https://developer.blender.org/rB8842569bc4bbb8ed0fa3e4dc401f354e064adf90

OSX/Cycles: tentative fix for avx, try use the compiler that is default on desired xcode version.
Atm. it is only verified to work with clang 5.0, so either this works too with llvm-gcc or apple gcc,
or we have to rise the requirements for osx.

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

M	intern/cycles/SConscript

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

diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 83d5da9..2b97d54 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -103,7 +103,7 @@ 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, cc_compilerchange='/usr/bin/clang', cxx_compilerchange='/usr/bin/clang++')
+    cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++')
 else:
     cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags)