diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-29 23:32:17 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-02 12:20:45 +0300 |
| commit | 3e23f36a3c17863b11d9311af204e486e63cac19 (patch) | |
| tree | e8efd8cfe5ca117b303eaa8fa441e93b7f3faf8c /mesonbuild/environment.py | |
| parent | 1c1277de7c8035f7a4b67b2606dd973a10dbc7d9 (diff) | |
| download | meson-3e23f36a3c17863b11d9311af204e486e63cac19.zip meson-3e23f36a3c17863b11d9311af204e486e63cac19.tar.gz meson-3e23f36a3c17863b11d9311af204e486e63cac19.tar.bz2 | |
Fix detection to work with newer Java compilers.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index ff7c706..0115fb3 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) + '"') |