diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-17 17:56:16 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-17 17:56:29 +0400 |
| commit | 8842569bc4bbb8ed0fa3e4dc401f354e064adf90 (patch) | |
| tree | ea45c1794fa7d91eba50d5a21b31ae40d82d29bc | |
| parent | bec9a3fa7c312e57570858165c82543eb619d9a4 (diff) | |
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.
| -rw-r--r-- | intern/cycles/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 83d5da981c2..2b97d54dc08 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) |