diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 13:31:26 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 13:31:26 +0300 |
| commit | 0feca278a48c494ca53dbd5f59985f9540a65401 (patch) | |
| tree | 9e1c1a7fab69900fa594f74049b139be3cf18df8 /build_files | |
| parent | 967b04cb07c58be927cae60767891ab4cbb2b767 (diff) | |
| parent | ae76a90593fb03187789e29676f589adfd5294ea (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 |
1 files changed, 2 insertions, 0 deletions
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)) |