Mercurial > hg > graal-compiler

diff 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
line wrap: on
line diff
--- a/mx/mx_graal.py	Mon Jun 08 22:21:12 2015 +0200
+++ b/mx/mx_graal.py	Mon Jun 08 22:32:04 2015 +0200
@@ -1137,9 +1137,11 @@
         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))
 
-    if vm == 'original':
-        truffle_jar = mx.archive(['@TRUFFLE'])[0]
-        args = ['-Xbootclasspath/p:' + truffle_jar] + args
+    # Unconditionally prepend Truffle to the boot class path.
+    # This used to be done by the VM itself but was removed to
+    # separate the VM from Truffle.
+    truffle_jar = mx.archive(['@TRUFFLE'])[0]
+    args = ['-Xbootclasspath/p:' + truffle_jar] + args
 
     args = mx.java().processArgs(args)
     return (pfx, exe, vm, args, cwd)