[Bf-blender-cvs] [3a24e63] master: Buildbot: Attempt to work-around unsupported clang on OSX machine

Sergey Sharybin noreply at git.blender.org
Tue Mar 29 19:46:33 CEST 2016


Commit: 3a24e6320f31a790ea9d3c912a35db2186140b71
Author: Sergey Sharybin
Date:   Tue Mar 29 19:46:10 2016 +0200
Branches: master
https://developer.blender.org/rB3a24e6320f31a790ea9d3c912a35db2186140b71

Buildbot: Attempt to work-around unsupported clang on OSX machine

Ideally this would need to be fixed by nvcc itself. but they didn't
do that for a long time.

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 5f7e930..0f34551 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -74,6 +74,7 @@ if 'cmake' in builder:
         # Set up OSX architecture
         if builder.endswith('x86_64_10_6_cmake'):
             cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
+        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
 
     elif builder.startswith('win'):
         install_dir = None




More information about the Bf-blender-cvs mailing list