diff options
| author | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2016-07-19 22:40:57 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-07-19 20:10:57 +0300 |
| commit | 88aafd363e3b63184b42d66b9307ec701670b529 (patch) | |
| tree | 0ce768f1b7a5f7c7c21874edfeb4944f3bfa65e6 /mesonbuild/environment.py | |
| parent | 69d9c2228d718a627fdb3f8504cbc4cdff0b1f4c (diff) | |
| download | meson-88aafd363e3b63184b42d66b9307ec701670b529.zip meson-88aafd363e3b63184b42d66b9307ec701670b529.tar.gz meson-88aafd363e3b63184b42d66b9307ec701670b529.tar.bz2 | |
Normalize the path of a configured file to avoid dupes (#640)
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index b9552a9..98ce933 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -45,11 +45,13 @@ def find_valgrind(): def detect_ninja(): for n in ['ninja', 'ninja-build']: try: - p = subprocess.Popen([n, '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + p = subprocess.Popen([n, '--version'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) except FileNotFoundError: continue - p.communicate() - if p.returncode == 0: + version = p.communicate()[0].decode(errors='ignore') + # 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(version, ">=1.6"): return n def detect_cpu_family(): |