Mercurial > hg > graal-compiler
diff mx.graal/mx_graal_9.py @ 23295:22f57623221f
override "jvmci" tag for --jdk option with Graal specific JDK config
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 12 Jan 2016 15:31:53 +0100 |
| parents | fd7e09778f42 |
| children | 279eb7ca5d24 |
line wrap: on
line diff
--- a/mx.graal/mx_graal_9.py Tue Jan 12 14:34:05 2016 +0100 +++ b/mx.graal/mx_graal_9.py Tue Jan 12 15:31:53 2016 +0100 @@ -361,12 +361,12 @@ cmd = [jdk.java] + ['-' + get_vm()] + jvmciModeArgs + args return mx.run(cmd, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd) -_GRAAL_JVMCI_TAG = 'graal' +_JVMCI_JDK_TAG = 'jvmci' class GraalJVMCI9JDKConfig(mx.JDKConfig): def __init__(self, original): self._original = original - mx.JDKConfig.__init__(self, original.home, tag=_GRAAL_JVMCI_TAG) + mx.JDKConfig.__init__(self, original.home, tag=_JVMCI_JDK_TAG) def run_java(self, args, **kwArgs): run_java(self._original, args, **kwArgs) @@ -378,7 +378,9 @@ def description(self): return "JVMCI JDK with Graal" -mx.addJDKFactory(_GRAAL_JVMCI_TAG, mx.JavaCompliance('9'), GraalJDKFactory()) +# This will override the 'generic' JVMCI JDK with a Graal JVMCI JDK that has +# support for -G style Graal options. +mx.addJDKFactory(_JVMCI_JDK_TAG, mx.JavaCompliance('9'), GraalJDKFactory()) def run_vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, debugLevel=None, vmbuild=None): """run a Java program by executing the java executable in a JVMCI JDK"""