Mercurial > hg > graal-compiler

comparison mx/mx_graal.py @ 21796:1c22030625eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved putting truffle.jar on the boot class path from the VM to mx (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Mon, 08 Jun 2015 22:32:04 +0200
parents cd36556e1b78
children 395ac43a8578
comparison
equal deleted inserted replaced
21795:5d589f7383a6 21796:1c22030625eb
1135 if '-version' in args: 1135 if '-version' in args:
1136 ignoredArgs = args[args.index('-version') + 1:] 1136 ignoredArgs = args[args.index('-version') + 1:]
1137 if len(ignoredArgs) > 0: 1137 if len(ignoredArgs) > 0:
1138 mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs)) 1138 mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs))
1139 1139
1140 if vm == 'original': 1140 # Unconditionally prepend Truffle to the boot class path.
1141 truffle_jar = mx.archive(['@TRUFFLE'])[0] 1141 # This used to be done by the VM itself but was removed to
1142 args = ['-Xbootclasspath/p:' + truffle_jar] + args 1142 # separate the VM from Truffle.
1143 truffle_jar = mx.archive(['@TRUFFLE'])[0]
1144 args = ['-Xbootclasspath/p:' + truffle_jar] + args
1143 1145
1144 args = mx.java().processArgs(args) 1146 args = mx.java().processArgs(args)
1145 return (pfx, exe, vm, args, cwd) 1147 return (pfx, exe, vm, args, cwd)
1146 1148
1147 def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None): 1149 def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):