projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac880b6
)
Buildbot: Attempt to fix CUDA compilation on OSX
author
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Apr 2017 08:01:28 +0000
(10:01 +0200)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Apr 2017 08:01:28 +0000
(10:01 +0200)
Stupid toolkit is really fragile about CLang version.
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 4fb05c9f977146be49424390fbf6889712044572..9b14bba87feee1ab645ae3fd748560d4b8e27a40 100644
(file)
--- a/
build_files/buildbot/slave_compile.py
+++ b/
build_files/buildbot/slave_compile.py
@@
-74,6
+74,9
@@
if 'cmake' in builder:
cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF')
cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6')
+ cmake_extra_options.append('CUDA_HOST_COMPILER=/usr/local/cuda-hack/clang')
+ cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
+
elif builder.startswith('win'):