Mercurial > hg > truffle

changeset 16877:6adb14d2320c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9d4c73b0646e
children bbb987aec58d
files mx/mx_graal.py src/share/vm/runtime/os.cpp
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Mon Aug 18 19:07:56 2014 +0200
+++ b/mx/mx_graal.py	Wed Aug 20 17:10:13 2014 +0200
@@ -990,6 +990,10 @@
         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
+
     args = mx.java().processArgs(args)
     return (pfx, exe, vm, args, cwd)
 
--- a/src/share/vm/runtime/os.cpp	Mon Aug 18 19:07:56 2014 +0200
+++ b/src/share/vm/runtime/os.cpp	Wed Aug 20 17:10:13 2014 +0200
@@ -1269,6 +1269,8 @@
 #endif
 #ifdef GRAAL
         "%/lib/graal-loader.jar:"
+#endif
+#ifndef NO_TRUFFLE_JAR
         "%/lib/truffle.jar:"
 #endif
         "%/classes";