Mercurial > hg > truffle

changeset 18799:750db34c9fe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client-nograal is supported on Mac
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 08 Jan 2015 10:20:07 -0800
parents f1e7e4f6d833
children 650934ca7157
files mx/mx_graal.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Wed Jan 07 18:02:00 2015 +0100
+++ b/mx/mx_graal.py	Thu Jan 08 10:20:07 2015 -0800
@@ -100,7 +100,7 @@
 JDK_UNIX_PERMISSIONS_EXEC = 0755
 
 def isVMSupported(vm):
-    if 'client' in vm and len(platform.mac_ver()[0]) != 0:
+    if 'client' == vm and len(platform.mac_ver()[0]) != 0:
         # Client VM not supported: java launcher on Mac OS X translates '-client' to '-server'
         return False
     return True
@@ -1924,7 +1924,7 @@
         mx.abort(1)
 
     vmArgs, benchmarksAndJsons = _extract_VM_args(args)
-    if '-XX:-UseGraalClassLoader' not in vmArgs:
+    if isGraalEnabled(_get_vm()) and  '-XX:-UseGraalClassLoader' not in vmArgs:
         vmArgs = ['-XX:-UseGraalClassLoader'] + vmArgs
 
     benchmarks = [b for b in benchmarksAndJsons if not b.startswith('{')]