diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-24 18:41:41 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-24 18:41:41 +0200 |
| commit | 8771b1f49b5900731fc08d533d2cc20b1c20d995 (patch) | |
| tree | 31dce557ea79926ac4813441237cabaf2b8ec0c1 /environment.py | |
| parent | 730a3f4213aee6a063f8039c5155f1a52861b703 (diff) | |
| download | meson-8771b1f49b5900731fc08d533d2cc20b1c20d995.zip meson-8771b1f49b5900731fc08d533d2cc20b1c20d995.tar.gz meson-8771b1f49b5900731fc08d533d2cc20b1c20d995.tar.bz2 | |
Better Ninja detection.
Diffstat (limited to 'environment.py')
| -rw-r--r-- | environment.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/environment.py b/environment.py index 4ae5922..58d0219 100644 --- a/environment.py +++ b/environment.py @@ -1507,10 +1507,8 @@ def find_valgrind(): def detect_ninja(): for n in ['ninja', 'ninja-build']: - # Plain 'ninja' or 'ninja -h' yields an error - # code. Thanks a bunch, guys. try: - p = subprocess.Popen([n, '-t', 'list'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + p = subprocess.Popen([n, '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) except FileNotFoundError: continue p.communicate() |