comparison mx/mx_graal.py @ 16877:6adb14d2320c

truffle.jar should always be on the bootclasspath regardless of the 'graal' status of the vm.
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 20 Aug 2014 17:10:13 +0200
parents 73d994651fcd
children 0583d157992a
comparison
equal deleted inserted replaced
16876:9d4c73b0646e 16877:6adb14d2320c
987 987
988 if '-version' in args: 988 if '-version' in args:
989 ignoredArgs = args[args.index('-version') + 1:] 989 ignoredArgs = args[args.index('-version') + 1:]
990 if len(ignoredArgs) > 0: 990 if len(ignoredArgs) > 0:
991 mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs)) 991 mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs))
992
993 if vm == 'original':
994 truffle_jar = mx.archive(['@TRUFFLE'])[0]
995 args = ['-Xbootclasspath/p:' + truffle_jar] + args
992 996
993 args = mx.java().processArgs(args) 997 args = mx.java().processArgs(args)
994 return (pfx, exe, vm, args, cwd) 998 return (pfx, exe, vm, args, cwd)
995 999
996 def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None): 1000 def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):