[Bf-blender-cvs] [5a5b540] master: Buildbot: Fix wrong architecture passed to CMake

Sergey Sharybin noreply at git.blender.org
Sun Dec 20 10:12:59 CET 2015


Commit: 5a5b5403567d0ec0b921b774252a5d1331de90b4
Author: Sergey Sharybin
Date:   Sun Dec 20 14:12:43 2015 +0500
Branches: master
https://developer.blender.org/rB5a5b5403567d0ec0b921b774252a5d1331de90b4

Buildbot: Fix wrong architecture passed to CMake

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 2f5110e..a0b2b63 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -59,11 +59,11 @@ if 'cmake' in builder:
         remove_cache = True
         install_dir = None
         # Set up OSX architecture
-        if builder.endswith('x86_64_cmake'):
+        if builder.endswith('x86_64_10_6_cmake'):
             cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
-        elif builder.endswith('i386_cmake'):
+        elif builder.endswith('i386_10_6_cmake'):
             cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=i386')
-        elif builder.endswith('ppc_cmake'):
+        elif builder.endswith('ppc_10_6_cmake'):
             cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc')
 
     elif builder.startswith('win'):




More information about the Bf-blender-cvs mailing list