Buildbot: Correct previous release
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 6 Apr 2017 09:39:06 +0000 (11:39 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 6 Apr 2017 09:39:06 +0000 (11:39 +0200)
Seems CMake is not happy about changing compiler from script.

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

index 320edab65e8f0f1390d322887923e76c63bab334..ed5417c1c6e653e83f96fec3235cce9d9ed8b033 100644 (file)
@@ -21,10 +21,6 @@ else()
        message(FATAL_ERROR "Unknown build environment")
 endif()
 
        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)
 # Default to only build Blender, not the player
 set(WITH_BLENDER             ON  CACHE BOOL "" FORCE)
 set(WITH_PLAYER              OFF CACHE BOOL "" FORCE)
index c8d69c3864433fd944abb1f39e32d2631c7174a9..4fb05c9f977146be49424390fbf6889712044572 100644 (file)
@@ -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']
             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))
 
 
     cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))