diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-17 22:45:17 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-18 00:30:52 +0200 |
| commit | 5eb64a6f3e47b570f544524ef48dc6ef0e4dce59 (patch) | |
| tree | 0ce453d143e3c4507f254010cb28b93f5d77f87f /mesonbuild/environment.py | |
| parent | 2009fdbd434279f0feddccc610067dedb7a26133 (diff) | |
| download | meson-5eb64a6f3e47b570f544524ef48dc6ef0e4dce59.zip meson-5eb64a6f3e47b570f544524ef48dc6ef0e4dce59.tar.gz meson-5eb64a6f3e47b570f544524ef48dc6ef0e4dce59.tar.bz2 | |
Revert "Merge pull request #1931 from centricular/use-patched-ninja"
This reverts commit aab7ada356e02033e4030143cf363d06d975283b, reversing
changes made to e1b24765afd9e7d2d8043a408d69c7ad814d3551.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index b3d72e6..b0002a0 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -89,19 +89,16 @@ def find_coverage_tools(): genhtml_exe = None return gcovr_exe, lcov_exe, genhtml_exe -def detect_ninja(version='1.5', log=False): +def detect_ninja(version='1.5'): for n in ['ninja', 'ninja-build']: try: p, found = Popen_safe([n, '--version'])[0:2] except (FileNotFoundError, PermissionError): # Doesn't exist in PATH or isn't executable continue - found = found.strip() # Perhaps we should add a way for the caller to know the failure mode # (not found or too old) if p.returncode == 0 and mesonlib.version_compare(found, '>=' + version): - if log: - mlog.log('Found ninja-{} at {}'.format(found, shlex.quote(shutil.which(n)))) return n def detect_native_windows_arch(): |