Mercurial > hg > graal-compiler
changeset 22644:54257f3273df
Always put TRUFFLE_API on the bootclasspath
Use mx_jvmci to always prepend TRUFFLE_API to the bootclasspath for
jvmci JDKs.
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Wed, 16 Sep 2015 14:42:30 +0200 |
| parents | 9ecfccd6eec1 |
| children | cf8a2c999270 |
| files | mx.graal/mx_graal.py |
| diffstat | 1 files changed, 4 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/mx_graal.py Wed Sep 16 14:12:37 2015 +0200 +++ b/mx.graal/mx_graal.py Wed Sep 16 14:42:30 2015 +0200 @@ -35,7 +35,6 @@ import mx import mx_jvmci from mx_jvmci import JvmciJDKDeployedDist, run_vm, VM, Task, get_vm, isJVMCIEnabled, get_jvmci_jdk, get_jvmci_jdk_dir, buildvms -import mx_unittest from mx_unittest import unittest import mx_gate @@ -83,17 +82,6 @@ mx_gate.add_jacoco_includes(['com.oracle.graal.*']) mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution']) -def _unittest_config_participant(config): - vmArgs, mainClass, mainClassArgs = config - # Unconditionally prepend truffle.jar to the boot class path. - # This used to be done by the VM itself but was removed to - # separate the VM from Truffle. - truffle_jar = mx.distribution('truffle:TRUFFLE_API').path - vmArgs = ['-Xbootclasspath/p:' + truffle_jar] + vmArgs - return (vmArgs, mainClass, mainClassArgs) - -mx_unittest.add_config_participant(_unittest_config_participant) - def _run_benchmark(args, availableBenchmarks, runBenchmark): vmOpts, benchmarksAndOptions = mx.extract_VM_args(args, useDoubleDash=availableBenchmarks is None) @@ -490,3 +478,7 @@ 'deoptalot' : [deoptalot, '[n]'], 'longtests' : [longtests, ''], }) + + +def mx_post_parse_cmd_line(opts): + mx_jvmci.add_bootclasspath_prepend(mx.distribution('truffle:TRUFFLE_API'))