diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-29 23:32:17 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-29 23:32:17 +0300 |
| commit | 312204dcf379bb80e3fc900ab1422d8a4d485f33 (patch) | |
| tree | a3abfcb4df470dc147751297bda8b03ea7dc5fbf | |
| parent | 150351cfdd2e1740776069c403eb49b87b5e94a3 (diff) | |
| download | meson-java9.tar.gz | |
Fix detection to work with never Java compilers.java9
| -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 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) + '"') |