From 3e23f36a3c17863b11d9311af204e486e63cac19 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Thu, 29 Mar 2018 23:32:17 +0300 Subject: [PATCH] Fix detection to work with newer Java compilers. --- mesonbuild/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index ff7c706e8..0115fb353 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -674,7 +674,7 @@ class Environment: except OSError: raise EnvironmentException('Could not execute Java compiler "%s"' % ' '.join(exelist)) version = search_version(err) - if 'javac' in err: + if 'javac' in out or 'javac' in err: return JavaCompiler(exelist, version) raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"')