[Bf-blender-cvs] [f017145] master: Buildbot: Disable CUDA binaries for 32bit OSX slave

Sergey Sharybin noreply at git.blender.org
Sun Dec 20 11:19:48 CET 2015


Commit: f01714506a393c8a0b6240633e09a97cab4727ab
Author: Sergey Sharybin
Date:   Sun Dec 20 15:19:02 2015 +0500
Branches: master
https://developer.blender.org/rBf01714506a393c8a0b6240633e09a97cab4727ab

Buildbot: Disable CUDA binaries for 32bit OSX slave

Funny thing, 32bit OSX slave was always building 64bit CUDA kernels
and nobody never noticed this..

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index ff7fb87..4ca57f3 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -62,6 +62,7 @@ if 'cmake' in builder:
         if builder.endswith('x86_64_10_6_cmake'):
             cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
         elif builder.endswith('i386_10_6_cmake'):
+            build_cubins = False
             cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=i386')
             # Some special options to disable usupported features
             cmake_options.append("-DWITH_CYCLES_OSL=OFF")




More information about the Bf-blender-cvs mailing list