Mercurial > hg > truffle
diff mx/mx_graal.py @ 21687:afea1d08c393
Merge with df4579cb9503128c646bd04e66646ccfa7faf25f
| author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
|---|---|
| date | Tue, 02 Jun 2015 18:32:11 -0700 |
| parents | 8d0c2aabfc2d |
| children | dd987b035a0b |
line wrap: on
line diff
--- a/mx/mx_graal.py Tue Jun 02 17:41:19 2015 -0700 +++ b/mx/mx_graal.py Tue Jun 02 18:32:11 2015 -0700 @@ -614,9 +614,9 @@ def _updateJVMCIFiles(jdkDir): jreJVMCIDir = join(jdkDir, 'jre', 'lib', 'jvmci') jvmciJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.endswith('.jar')] - jreGraalServicesDir = join(jreJVMCIDir, 'services') - jreGraalOptionsDir = join(jreJVMCIDir, 'options') - _extractJVMCIFiles(_getJdkDeployedJars(jdkDir), jvmciJars, jreGraalServicesDir, jreGraalOptionsDir) + jreJVMCIServicesDir = join(jreJVMCIDir, 'services') + jreJVMCIOptionsDir = join(jreJVMCIDir, 'options') + _extractJVMCIFiles(_getJdkDeployedJars(jdkDir), jvmciJars, jreJVMCIServicesDir, jreJVMCIOptionsDir) def _patchGraalVersionConstant(dist): """