[Bf-blender-cvs] [ae76a90593f] master: Buildbot: Correct previous release

[Sergey Sharybin]

Commit: ae76a90593fb03187789e29676f589adfd5294ea
Author: Sergey Sharybin
Date:   Thu Apr 6 11:39:06 2017 +0200
Branches: master
https://developer.blender.org/rBae76a90593fb03187789e29676f589adfd5294ea

Buildbot: Correct previous release

Seems CMake is not happy about changing compiler from script.

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

M	build_files/buildbot/config/blender_linux.cmake
M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index 320edab65e8..ed5417c1c6e 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -21,10 +21,6 @@ else()
 	message(FATAL_ERROR "Unknown build environment")
 endif()
 
-# Use backported version of the compiler instead of a system default one
-set(CMAKE_C_COMPILER "/usr/bin/gcc-6" CACHE STRING "" FORCE)
-set(CMAKE_CXX_COMPILER "/usr/bin/g++-6" CACHE STRING "" FORCE)
-
 # Default to only build Blender, not the player
 set(WITH_BLENDER             ON  CACHE BOOL "" FORCE)
 set(WITH_PLAYER              OFF CACHE BOOL "" FORCE)
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index c8d69c38644..4fb05c9f977 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -109,6 +109,8 @@ if 'cmake' in builder:
             chroot_name = 'buildbot_' + deb_name + '_i686'
             cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
             targets = ['player', 'blender', 'cuda']
+        cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-6",
+                                    "-DCMAKE_CXX_COMPILER=/usr/bin/g++-6"])
 
     cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))