From 38a3c30bc535c3ec2f70c70f83bda69acb58a12a Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 4 Mar 2019 11:31:44 +0200 Subject: [PATCH] Fix javac version lookup in JDK11. Closes #4322. --- mesonbuild/environment.py | 4 ++++ 1 file changed, 4 insertions(+) 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) + '"')