changeset 17411:6d82c240d83e

use -G:CompileTheWorldClasspath instead of -Xbootclasspath/p when doing Graal CTW on a Graal enabled VM
author Doug Simon <doug.simon@oracle.com>
date Fri, 10 Oct 2014 11:33:48 +0200
parents c58171f94377
children e28f20279ec8
files mx/mx_graal.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Fri Oct 10 10:54:34 2014 +0200
+++ b/mx/mx_graal.py	Fri Oct 10 11:33:48 2014 +0200
@@ -1375,8 +1375,11 @@
         jar = join(_jdk(installJars=False), 'jre', 'lib', 'rt.jar')
 
     vmargs += ['-XX:+CompileTheWorld']
-    if _get_vm() == 'graal':
-        vmargs += ['-XX:+BootstrapGraal', '-G:CompileTheWorldClasspath=' + jar]
+    vm_ = _get_vm()
+    if isGraalEnabled(vm_):
+        if vm_ == 'graal':
+            vmargs += ['-XX:+BootstrapGraal']
+        vmargs += ['-G:CompileTheWorldClasspath=' + jar]
     else:
         vmargs += ['-Xbootclasspath/p:' + jar]
     vm(vmargs)