Mercurial > hg > truffle

diff mx/mx_graal.py @ 18115:4ccabc85a62a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
IGV build: blacklist all JDKs from 8u20 included to 8u40 excluded
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 16 Oct 2014 17:07:38 +0200
parents cc1d1fc17338
children c4f649042a7b
line wrap: on
line diff
--- a/mx/mx_graal.py	Thu Oct 16 17:06:20 2014 +0200
+++ b/mx/mx_graal.py	Thu Oct 16 17:07:38 2014 +0200
@@ -1588,9 +1588,10 @@
     dacapo(['100', 'eclipse', '-esa'])
 
 def _igvFallbackJDK(env):
-    if mx._java_homes[0].version == mx.VersionSpec("1.8.0_20"):
+    igvHomes = [h for h in mx._java_homes if h.version < mx.VersionSpec("1.8.0_20") or h.version >= mx.VersionSpec("1.8.0_40")]
+    if igvHomes[0] != mx._java_homes[0]:
         env = dict(env)
-        fallbackJDK = mx._java_homes[1]
+        fallbackJDK = igvHomes[0]
         mx.logv("1.8.0_20 has a known javac bug (JDK-8043926), thus falling back to " + str(fallbackJDK.version))
         env['JAVA_HOME'] = str(fallbackJDK.jdk)
     return env