Fix javac version lookup in JDK11. Closes #4322.

pull/5023/head
Jussi Pakkanen 6 years ago
parent ee863d33c1
commit 38a3c30bc5
  1. 4
      mesonbuild/environment.py

@ -931,6 +931,10 @@ class Environment:
raise EnvironmentException('Could not execute Java compiler "%s"' % ' '.join(exelist))
if 'javac' in out or 'javac' in err:
version = search_version(err if 'javac' in err else out)
if not version or version == 'unknown version':
parts = (err if 'javac' in err else out).split()
if len(parts) > 1:
version = parts[1]
return JavaCompiler(exelist, version)
raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"')

Loading…
Cancel
Save