Fix javac version lookup in JDK11. Closes #4322.jdk11

1 files changed, 4 insertions, 0 deletions

diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 3bfdfd7d7..c25ef3351 100644
--- a/mesonbuild/environment.py
+++ b/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) + '"')