diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-29 17:29:25 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-29 17:29:25 +0300 |
| commit | c3a6b18537f2e574db626e31a09cb351da04b473 (patch) | |
| tree | e31a3459cf08f2619e8bfd6fdfc48c1337ac9381 /build_files/buildbot/slave_compile.py | |
| parent | 2385fda448a49dcd57acd8b9eae600846212a642 (diff) | |
Buildbot: Some inital work to support newer chroot environment
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index eb204cd1c00..6465f2e634d 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -102,7 +102,9 @@ if 'cmake' in builder: elif builder.startswith('linux'): tokens = builder.split("_") glibc = tokens[1] - if glibc == 'glibc219': + if glibc == 'glibc224': + deb_name = "stretch" + elif glibc == 'glibc219': deb_name = "jessie" elif glibc == 'glibc211': deb_name = "squeeze" @@ -115,8 +117,9 @@ if 'cmake' in builder: bits = 32 chroot_name = 'buildbot_' + deb_name + '_i686' targets = ['player', '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)) |