[Bf-blender-cvs] [ca3f7021de9] master: Buildbot: Tweaks to current macOS config

Sergey Sharybin noreply at git.blender.org
Sun Oct 1 10:00:54 CEST 2017


Commit: ca3f7021de995dc088896324c781e2f17e9b125f
Author: Sergey Sharybin
Date:   Sun Oct 1 09:59:50 2017 +0200
Branches: master
https://developer.blender.org/rBca3f7021de995dc088896324c781e2f17e9b125f

Buildbot: Tweaks to current macOS config

Also disable CUDA binaries for now, those would need some extra work.

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 84f924b2dd9..88da5ca956c 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -70,13 +70,12 @@ if 'cmake' in builder:
 
     if builder.startswith('mac'):
         # Set up OSX architecture
-        if builder.endswith('x86_64_10_6_cmake'):
+        if builder.endswith('x86_64_10_9_cmake'):
             cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
-        cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6')
+        cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9')
         cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang')
         cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
-
-
+        build_cubins = False
 
     elif builder.startswith('win'):
         if builder.endswith('_vc2015'):



More information about the Bf-blender-cvs mailing list