4 files changed, 10 insertions, 3 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py
index ab93628c78d..c1beefcf83d 100644
--- a/build_files/buildbot/config/user-config-mac-i386.py
+++ b/build_files/buildbot/config/user-config-mac-i386.py
@@ -5,3 +5,5 @@ WITH_BF_CYCLES_CUDA_BINARIES = True
 
 WITH_BF_CYCLES_OSL = False # OSL never worked on OSX 32bit !
 
+WITH_BF_COLLADA = False # we drop 32bit, newest collada is only x86_64 !
+
diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py
index ac923f48abe..6a13c80f6ce 100644
--- a/build_files/buildbot/config/user-config-mac-x86_64.py
+++ b/build_files/buildbot/config/user-config-mac-x86_64.py
@@ -1,5 +1,6 @@
+CC = "../lib/darwin-9.x.universal/clang-omp-3.5/bin/clang"
+CXX = "../lib/darwin-9.x.universal/clang-omp-3.5/bin/clang++"
 
 MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
 
 WITH_BF_CYCLES_CUDA_BINARIES = True
-
diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index 46131c5e1de..ec44705931c 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -124,10 +124,12 @@ else:
     directory = 'public_html/download'
 
 try:
+    filename = os.path.join(directory, packagename)
     zf = z.open(package)
-    f = file(os.path.join(directory, packagename), "wb")
+    f = file(filename, "wb")
 
     shutil.copyfileobj(zf, f)
+    os.chmod(filename, 0644)
 
     zf.close()
     z.close()
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index cbe345e764c..7b3f848a198 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -116,6 +116,8 @@ else:
 
             if config.find('player') != -1:
                 scons_options.append('BF_BUILDDIR=%s_player' % (build_dir))
+            elif config.find('cuda') != -1:
+                scons_options.append('BF_BUILDDIR=%s_cuda' % (build_dir))
             else:
                 scons_options.append('BF_BUILDDIR=%s' % (build_dir))
 
@@ -140,7 +142,7 @@ else:
 
             retcode = subprocess.call(cur_scons_cmd + scons_options)
             if retcode != 0:
-                print('Error building rules wuth config ' + config)
+                print('Error building rules with config ' + config)
                 sys.exit(retcode)
 
         sys.exit(0)