Fix detection to work with newer Java compilers.

7 years ago · 3e23f36a3c
parent 1c1277de7c
commit 3e23f36a3c
1 changed files with 1 additions and 1 deletions
--- 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) + '"')