[Bf-blender-cvs] [b354c158051] master: Buildbot: Attempt to fix CUDA compilation on OSX

Sergey Sharybin noreply at git.blender.org
Fri Apr 14 10:01:53 CEST 2017


Commit: b354c15805199a1bf841d3100edd8071583fbeba
Author: Sergey Sharybin
Date:   Fri Apr 14 10:01:28 2017 +0200
Branches: master
https://developer.blender.org/rBb354c15805199a1bf841d3100edd8071583fbeba

Buildbot: Attempt to fix CUDA compilation on OSX

Stupid toolkit is really fragile about CLang version.

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 4fb05c9f977..9b14bba87fe 100644
--- 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'):




More information about the Bf-blender-cvs mailing list