Mercurial > hg > truffle

changeset 17392:9c241dc74cfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: specify jar of classes differently depending on whether Graal is hosted or not
author Doug Simon <doug.simon@oracle.com>
date Thu, 09 Oct 2014 15:51:34 +0200
parents 9e5abd0e7916
children a8186c7f73e9
files mx/mx_graal.py
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Thu Oct 09 14:51:39 2014 +0200
+++ b/mx/mx_graal.py	Thu Oct 09 15:51:34 2014 +0200
@@ -1370,13 +1370,15 @@
         vmargs.append('-G:CompileTheWorldConfig=' + args.ctwopts)
 
     if args.jar:
-        jar = args.jar
+        jar = os.path.abspath(args.jar)
     else:
         jar = join(_jdk(installJars=False), 'jre', 'lib', 'rt.jar')
 
-    vmargs += ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + jar]
+    vmargs += ['-XX:+CompileTheWorld']
     if _get_vm() == 'graal':
-        vmargs += ['-XX:+BootstrapGraal']
+        vmargs += ['-XX:+BootstrapGraal', '-G:CompileTheWorldClasspath=' + jar]
+    else:
+        vmargs += ['-Xbootclasspath/p:' + jar]
     vm(vmargs)
 
 def _basic_gate_body(args, tasks):