Merge branch 'master' into blender2.8
[blender.git] / build_files / buildbot / slave_compile.py
index fc430971c1937b513ffd559ef9cc6e0045b52099..ce4d0c8de669e22c1385a70aeb819fe7d6666a5b 100644 (file)
@@ -101,7 +101,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"
@@ -113,8 +115,9 @@ if 'cmake' in builder:
             bits = 32
             chroot_name = 'buildbot_' + deb_name + '_i686'
             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))