diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 12:39:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-06 12:39:06 +0300 |
| commit | ae76a90593fb03187789e29676f589adfd5294ea (patch) | |
| tree | 6363530047ceb2dfa785119700aeccc404402da5 /build_files/buildbot | |
| parent | 97300a3bebb719927fad46c79c5ea0955e3546e4 (diff) | |
Buildbot: Correct previous release
Seems CMake is not happy about changing compiler from script.
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 4 | ||||
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 |
2 files changed, 2 insertions, 4 deletions
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)) |