# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1408547413 -7200
# Node ID 6adb14d2320c1569755629591974dc08e8e898b2
# Parent  9d4c73b0646e938f3a85303d0abfbbf8953841ac
truffle.jar should always be on the bootclasspath regardless of the 'graal' status of the vm.

diff -r 9d4c73b0646e -r 6adb14d2320c mx/mx_graal.py
--- 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)
 
diff -r 9d4c73b0646e -r 6adb14d2320c src/share/vm/runtime/os.cpp
--- 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";