projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3566d0d
)
Buildbot: Disable CUDA binaries for 32bit OSX slave
author
Sergey Sharybin <sergey.vfx@gmail.com>
Sun, 20 Dec 2015 10:19:02 +0000
(15:19 +0500)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Sun, 20 Dec 2015 10:19:02 +0000
(15:19 +0500)
Funny thing, 32bit OSX slave was always building 64bit CUDA kernels
and nobody never noticed this..
build_files/buildbot/slave_compile.py
patch
|
blob
|
history
diff --git
a/build_files/buildbot/slave_compile.py
b/build_files/buildbot/slave_compile.py
index ff7fb873835ac219e23fe7f38f71f90d7b32dcbc..4ca57f395620d0fe670d5b16afdea0ecc322dfcb 100644
(file)
--- 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")