admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always perform Emscripten Clang build as a parallel build.

Browse Source
This commit is contained in:
Jukka Jylänki
2014-07-08 11:07:19 +03:00
parent 82407a23dc
commit 46036b5a93
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
emsdk
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys, optparse, subprocess, urllib2, os, os.path, errno, zipfile, string, json, platform, shutil, tarfile, urlparse, tempfile import sys, optparse, subprocess, urllib2, os, os.path, errno, zipfile, string, json, platform, shutil, tarfile, urlparse, tempfile, multiprocessing
# EMSDK_DEV is a developer mode flag, which, if true, the SDK is downloaded from a 'staging' online source, # EMSDK_DEV is a developer mode flag, which, if true, the SDK is downloaded from a 'staging' online source,
# instead of the public source. New releases are first deployed to the staging source for testing, before # instead of the public source. New releases are first deployed to the staging source for testing, before
@@ -393,19 +393,24 @@ def build_fastcomp_tool(tool):
git_clone_checkout_and_pull(tool.clang_url, clang_root, tool.git_branch) git_clone_checkout_and_pull(tool.clang_url, clang_root, tool.git_branch)
build_dir = fastcomp_build_dir(tool) build_dir = fastcomp_build_dir(tool)
build_with_vs2010 = True build_with_vs2010 = True
cpu_cores = max(multiprocessing.cpu_count()-1, 1) # Don't saturate all cores to not steal the whole system, but be aggressive.
if cpu_cores > 1:
print 'Performing a parallel build with ' + str(cpu_cores) + ' cores.'
else:
print 'Performing a singlethreaded build.'
if WINDOWS: if WINDOWS:
if build_with_vs2010: if build_with_vs2010:
if tool.bitness == 64: if tool.bitness == 64:
generator = 'Visual Studio 10 Win64' generator = 'Visual Studio 10 Win64'
else: else:
generator = 'Visual Studio 10' generator = 'Visual Studio 10'
make = ['C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\MSBuild.exe', '/t:Build', '/p:Configuration=RelWithDebInfo', '/nologo', '/verbosity:minimal', 'LLVM.sln'] make = ['C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\MSBuild.exe', '/maxcpucount:' + cpu_cores, '/t:Build', '/p:Configuration=RelWithDebInfo', '/nologo', '/verbosity:minimal', 'LLVM.sln']
else: else:
generator = 'MinGW Makefiles' generator = 'MinGW Makefiles'
make = ['mingw32-make'] make = ['mingw32-make', '-j' + cpu_cores]
else: else:
generator = 'Unix Makefiles' generator = 'Unix Makefiles'
make = ['make'] make = ['make', '-j' + cpu_cores]
build_root = os.path.join(fastcomp_root, build_dir) build_root = os.path.join(fastcomp_root, build_dir)