Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 29 Aug 2018 14:42:32 +0000 (16:42 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 29 Aug 2018 14:42:32 +0000 (16:42 +0200)
1  2 
build_files/buildbot/config/blender_linux.cmake
build_files/buildbot/slave_compile.py
build_files/cmake/platform/platform_unix.cmake

@@@ -112,9 -116,10 +114,10 @@@ if 'cmake' in builder
          elif builder.endswith('i686_cmake'):
              bits = 32
              chroot_name = 'buildbot_' + deb_name + '_i686'
 -            targets = ['player', 'blender']
 +            targets = ['blender']
-         cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
-                                     "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
+         if deb_name != "stretch":
+             cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
+                                         "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
  
      cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))