Mercurial > hg > truffle
diff mx/mx_graal.py @ 13952:b076b5c13c3f
mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments.
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 14 Feb 2014 15:09:57 +0100 |
parents | 392b6ac8da36 |
children | 4cd7c6629841 |
line wrap: on
line diff
--- a/mx/mx_graal.py Thu Feb 13 17:59:27 2014 +0100 +++ b/mx/mx_graal.py Fri Feb 14 15:09:57 2014 +0100 @@ -729,10 +729,6 @@ mx.expand_project_in_args(args) if _make_eclipse_launch: mx.make_eclipse_launch(args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True)) - if len([a for a in args if 'PrintAssembly' in a]) != 0: - hsdis([], copyToDir=_vmLibDirInJdk(jdk)) - if mx.java().debug_port is not None: - args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(mx.java().debug_port)] + args if _jacoco == 'on' or _jacoco == 'append': jacocoagent = mx.library("JACOCOAGENT", True) # Exclude all compiler tests and snippets @@ -750,9 +746,6 @@ 'destfile' : 'jacoco.exec' } args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args - if '-d64' not in args: - args = ['-d64'] + args - exe = join(jdk, 'bin', mx.exe_suffix('java')) pfx = _vm_prefix.split() if _vm_prefix is not None else [] @@ -761,6 +754,7 @@ if len(ignoredArgs) > 0: mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs)) + args = mx.java().processArgs(args) return (pfx, exe, vm, args, cwd) def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):