Mercurial > hg > graal-jvmci-8
changeset 22170:480635800a1b
buildjmhdeps should use Graal for JAVA_HOME
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Sat, 11 Jul 2015 07:28:17 +0200 |
| parents | f9ddf6b6dd6b |
| children | 2eff41bef7cd |
| files | mx.jvmci/mx_jvmci.py |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py Fri Jul 10 23:53:09 2015 +0200 +++ b/mx.jvmci/mx_jvmci.py Sat Jul 11 07:28:17 2015 +0200 @@ -1589,13 +1589,16 @@ allDeps.append(name) d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None) d.make_archive() + env = os.environ.copy() + env['JAVA_HOME'] = get_jdk(vmToCheck='server') + env['MAVEN_OPTS'] = '-server -XX:-UseJVMCIClassLoader' cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId, '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path] if not mx._opts.verbose: cmd.append('-q') if args.settings: cmd = cmd + ['-s', args.settings] - mx.run(cmd) + mx.run(cmd, env=env) os.unlink(d.path) jmhPath = _get_jmh_path()