Mercurial > hg > truffle

comparison mx/commands.py @ 4227:1fe200db8c30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Environment variables for HotSpot's make are only set by mx.build if they aren't already defined.
author Doug Simon <doug.simon@oracle.com>
date Thu, 05 Jan 2012 14:25:58 +0100
parents e03ff10d4bfc
children e872562f95f8
comparison
equal deleted inserted replaced
4226:e03ff10d4bfc 4227:1fe200db8c30
309 winBuildSuccess = re.compile('Build succeeded.') 309 winBuildSuccess = re.compile('Build succeeded.')
310 if not _runInDebugShell(winBuildCmd, _graal_home, compilelogfile, winBuildSuccess): 310 if not _runInDebugShell(winBuildCmd, _graal_home, compilelogfile, winBuildSuccess):
311 mx.log('Error building project') 311 mx.log('Error building project')
312 return 312 return
313 else: 313 else:
314 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='3', ALT_BOOTDIR=jdk, INSTALL='y') 314 env = os.environ
315 env.setdefault('ARCH_DATA_MODEL', '64')
316 env.setdefault('LANG', 'C')
317 env.setdefault('HOTSPOT_BUILD_JOBS', '3')
318 env.setdefault('ALT_BOOTDIR', jdk)
319 env.setdefault('INSTALL', 'y')
315 mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage) 320 mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage)
316 321
317 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None): 322 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):
318 """run the GraalVM""" 323 """run the GraalVM"""
319 324