diff options
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 67fae89a22a..a5dadbde05c 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -53,9 +53,13 @@ if builder.find('cmake') != -1: retcode = subprocess.call(['make', '-s', '-j4', 'install']) sys.exit(retcode) else: + python_bin = 'python' + if builder.find('linux') != -1: + python_bin = '/opt/lib/python-2.7/bin/python2.7' + # scons os.chdir(blender_dir) - scons_cmd = ['python', 'scons/scons.py'] + scons_cmd = [python_bin, 'scons/scons.py'] scons_options = ['BF_FANCY=False'] # We're using the same rules as release builder, so tweak @@ -148,7 +152,7 @@ else: scons_options.append('MSVS_VERSION=12.0') scons_options.append('MSVC_VERSION=12.0') scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=1') - scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc') + scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') scons_options.append('BF_NUMJOBS=1') elif builder.find('mac') != -1: @@ -164,8 +168,6 @@ else: os.makedirs(install_dir) if builder.endswith('vc2013'): dlls = ('msvcp120.dll', 'msvcr120.dll', 'vcomp120.dll') - else: - dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest') if builder.find('win64') == -1: dlls_path = '..\\..\\..\\redist\\x86' else: @@ -173,6 +175,6 @@ else: for dll in dlls: shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll)) - retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) + retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options) sys.exit(retcode) |