diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-11-08 09:42:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-08 09:42:41 -0800 |
| commit | 470b3b5121564fd906c76436219eeba03f6bc76d (patch) | |
| tree | 1d3b669e47a06700fcfb329fe2168dfbe3308d82 /mesonbuild/environment.py | |
| parent | 1d60a6a2edb36632136db8f3547577838bca6a4c (diff) | |
| parent | 9294fd23be8d691ccbf41dbef1b39772e03c1eda (diff) | |
| download | meson-470b3b5121564fd906c76436219eeba03f6bc76d.zip meson-470b3b5121564fd906c76436219eeba03f6bc76d.tar.gz meson-470b3b5121564fd906c76436219eeba03f6bc76d.tar.bz2 | |
Merge pull request #4488 from dcbaker/java-fixes
Java fixes
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 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) + '"') |