# HG changeset patch # User Bernhard Urban # Date 1409662030 -7200 # Node ID ffddcdca8e742ae441028701314dc1d506a8cbdf # Parent 6a30738791f71c2d12d001b287f58f5862c45bf5 mx: support different name for jvm.cfg diff -r 6a30738791f7 -r ffddcdca8e74 mx/mx_graal.py --- 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)))