diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-11-05 15:12:08 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-11-07 14:26:03 -0800 |
| commit | d405b74caf700df2c39da75691e8df1ca25f7e10 (patch) | |
| tree | 6ce5d6977bb826a0924dfd3d50c0f526eabb43f9 | |
| parent | 1d60a6a2edb36632136db8f3547577838bca6a4c (diff) | |
| download | meson-d405b74caf700df2c39da75691e8df1ca25f7e10.zip meson-d405b74caf700df2c39da75691e8df1ca25f7e10.tar.gz meson-d405b74caf700df2c39da75691e8df1ca25f7e10.tar.bz2 | |
java: javac 9+ print their version to stdout not stderr
Fixes: #2569
| -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 f45f91b..2a6f750 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -803,8 +803,8 @@ class Environment: p, out, err = Popen_safe(exelist + ['-version']) except OSError: raise EnvironmentException('Could not execute Java compiler "%s"' % ' '.join(exelist)) - version = search_version(err) if 'javac' in out or 'javac' in err: + version = search_version(err if 'javac' in err else out) return JavaCompiler(exelist, version) raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"') |