Mercurial > hg > truffle
diff mx/mx_graal.py @ 18876:c446d00f2cdf
mx: added support for Jython 2.7b3 and made ordering in generated files more deterministic\nContributed-by: Igor Ignatyev <igor.ignatyev@oracle.com>
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Sat, 17 Jan 2015 11:26:18 +0100 |
| parents | fe4f875e435f |
| children | 19d99eec8876 |
line wrap: on
line diff
--- a/mx/mx_graal.py Fri Jan 16 14:24:04 2015 +0100 +++ b/mx/mx_graal.py Sat Jan 17 11:26:18 2015 +0100 @@ -26,7 +26,7 @@ # # ---------------------------------------------------------------------------------------------------- -import os, stat, errno, sys, shutil, zipfile, tarfile, tempfile, re, time, datetime, platform, subprocess, multiprocessing, StringIO, socket +import os, stat, errno, sys, shutil, zipfile, tarfile, tempfile, re, time, datetime, platform, subprocess, StringIO, socket from os.path import join, exists, dirname, basename from argparse import ArgumentParser, RawDescriptionHelpFormatter, REMAINDER from outputparser import OutputParser, ValuesMatcher @@ -697,7 +697,7 @@ buildVars = { 'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + mx.java().jdk + ')', 'ALT_OUTPUTDIR' : 'Build directory', - 'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(multiprocessing.cpu_count()) + ')', + 'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(mx.cpu_count()) + ')', 'INSTALL' : 'Install the built VM into the JDK? (default: y)', 'ZIP_DEBUGINFO_FILES' : 'Install zipped debug symbols file? (default: 0)', } @@ -888,7 +888,7 @@ mx.log('Error building project') return else: - cpus = multiprocessing.cpu_count() + cpus = mx.cpu_count() makeDir = join(_graal_home, 'make') runCmd = [mx.gmake_cmd(), '-C', makeDir]