Mercurial > hg > truffle
diff mx/mx_graal.py @ 16875:73d994651fcd
fixed regression when building original VM without a Java build beforehand
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 21 Aug 2014 12:01:35 +0200 |
| parents | 0d2e3399acfe |
| children | 6adb14d2320c |
line wrap: on
line diff
--- a/mx/mx_graal.py Tue Aug 19 10:48:05 2014 +0200 +++ b/mx/mx_graal.py Thu Aug 21 12:01:35 2014 +0200 @@ -459,10 +459,14 @@ _handle_missing_VM(build, vmToCheck if vmToCheck else 'graal') if installJars: - _installDistInJdks(mx.distribution('GRAAL')) - _installDistInJdks(mx.distribution('GRAAL_LOADER')) - _installDistInJdks(mx.distribution('TRUFFLE')) - _installDistInJdks(mx.distribution('GRAAL_TRUFFLE')) + def _installDistInJdksIfExists(dist): + if exists(dist.path): + _installDistInJdks(dist) + + _installDistInJdksIfExists(mx.distribution('GRAAL')) + _installDistInJdksIfExists(mx.distribution('GRAAL_LOADER')) + _installDistInJdksIfExists(mx.distribution('TRUFFLE')) + _installDistInJdksIfExists(mx.distribution('GRAAL_TRUFFLE')) if vmToCheck is not None: jvmCfg = _vmCfgInJdk(jdk) @@ -770,7 +774,7 @@ if build is None or len(build) == 0: continue - jdk = _jdk(build, create=True, installJars=not opts2.java) + jdk = _jdk(build, create=True, installJars=vm != 'original' and not opts2.java) if vm == 'original': if build != 'product':