Mercurial > hg > truffle

changeset 17015:ffddcdca8e74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: support different name for jvm.cfg
author Bernhard Urban <bernhard.urban@jku.at>
date Tue, 02 Sep 2014 14:47:10 +0200
parents 6a30738791f7
children 3482684330ee
files mx/mx_graal.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Tue Sep 02 14:46:50 2014 +0200
+++ b/mx/mx_graal.py	Tue Sep 02 14:47:10 2014 +0200
@@ -367,13 +367,13 @@
         return [join(jdk, 'jre', 'bin'), join(jdk, 'bin')]
     return [join(jdk, 'jre', 'lib', mx.get_arch(), 'jli'), join(jdk, 'lib', mx.get_arch(), 'jli')]
 
-def _vmCfgInJdk(jdk):
+def _vmCfgInJdk(jdk, jvmCfgFile='jvm.cfg'):
     """
     Get the jvm.cfg file.
     """
     if platform.system() == 'Windows':
-        return join(jdk, 'jre', 'lib', mx.get_arch(), 'jvm.cfg')
-    return join(_vmLibDirInJdk(jdk), 'jvm.cfg')
+        return join(jdk, 'jre', 'lib', mx.get_arch(), jvmCfgFile)
+    return join(_vmLibDirInJdk(jdk), jvmCfgFile)
 
 def _jdksDir():
     return os.path.abspath(join(_installed_jdks if _installed_jdks else _graal_home, 'jdk' + str(mx.java().version)))